Added in mousewheel as part of this.

This commit is contained in:
Adam Harrison 2021-11-07 14:31:15 -05:00
parent c04dc648de
commit 7a3e8ed86a
3 changed files with 10 additions and 12 deletions

View File

@ -928,7 +928,9 @@ function core.on_event(type, ...)
elseif type == "mousereleased" then elseif type == "mousereleased" then
core.root_view:on_mouse_released(...) core.root_view:on_mouse_released(...)
elseif type == "mousewheel" then elseif type == "mousewheel" then
core.root_view:on_mouse_wheel(...) if not core.root_view:on_mouse_wheel(...) then
did_keymap = keymap.on_mouse_wheel(...)
end
elseif type == "resized" then elseif type == "resized" then
core.window_mode = system.get_window_mode() core.window_mode = system.get_window_mode()
elseif type == "minimized" or type == "maximized" or type == "restored" then elseif type == "minimized" or type == "maximized" or type == "restored" then

View File

@ -85,6 +85,11 @@ function keymap.on_key_pressed(k, ...)
return false return false
end end
function keymap.on_mouse_wheel(delta, ...)
return not keymap.on_key_pressed("wheel" .. (delta > 0 and "up" or "down"), delta, ...)
and keymap.on_key_pressed("wheel", delta, ...)
end
local click_prefixes = { "", "d", "t" } local click_prefixes = { "", "d", "t" }
function keymap.on_mouse_pressed(button, x, y, clicks) function keymap.on_mouse_pressed(button, x, y, clicks)
return keymap.on_key_pressed(click_prefixes[((clicks - 1) % 3) + 1] .. button:sub(1,1) .. "click", x, y, clicks) return keymap.on_key_pressed(click_prefixes[((clicks - 1) % 3) + 1] .. button:sub(1,1) .. "click", x, y, clicks)

View File

@ -67,17 +67,6 @@ local function get_scale()
return current_scale return current_scale
end end
local on_mouse_wheel = RootView.on_mouse_wheel
function RootView:on_mouse_wheel(d, ...)
if keymap.modkeys["ctrl"] and config.plugins.scale.use_mousewheel then
if d < 0 then command.perform "scale:decrease" end
if d > 0 then command.perform "scale:increase" end
else
return on_mouse_wheel(self, d, ...)
end
end
local function res_scale() local function res_scale()
set_scale(default_scale) set_scale(default_scale)
end end
@ -101,6 +90,8 @@ keymap.add {
["ctrl+0"] = "scale:reset", ["ctrl+0"] = "scale:reset",
["ctrl+-"] = "scale:decrease", ["ctrl+-"] = "scale:decrease",
["ctrl+="] = "scale:increase", ["ctrl+="] = "scale:increase",
["ctrl+wheelup"] = "scale:increase",
["ctrl+wheeldown"] = "scale:decrease"
} }
return { return {