scroll mouse wheel to focus window under cursor

develop
Myk Taylor 2023-05-23 12:26:44 -07:00
parent 9e4c713180
commit f3ce805960
No known key found for this signature in database
GPG Key ID: 8A39CA0FA0C16E78
3 changed files with 17 additions and 10 deletions

@ -60,6 +60,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
- Core: For debugging purposes, you can now pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session. - Core: For debugging purposes, you can now pass ``--disable-dfhack`` on the Dwarf Fortress commandline or specify ``DFHACK_DISABLE=1`` in the environment to disable DFHack for the current session.
- `overlay`: added links to the quickstart guide and the control panel on the DF title screen - `overlay`: added links to the quickstart guide and the control panel on the DF title screen
- `gui/autodump`: fort-mode keybinding: Ctrl-H - `gui/autodump`: fort-mode keybinding: Ctrl-H
- Window behavior: if you have multiple DFHack tool windows open, scrolling the mouse wheel while over an unfocused window will focus it and raise it to the top
## Documentation ## Documentation

@ -4240,11 +4240,11 @@ input skips all unfocused ZScreens under that ZScreen and is passed directly to
the first non-ZScreen viewscreen. There are class attributes that can be set to the first non-ZScreen viewscreen. There are class attributes that can be set to
control what kind of unhandled input is passed to the lower layers. control what kind of unhandled input is passed to the lower layers.
If multiple ZScreens are visible and the player left or right clicks on a If multiple ZScreens are visible and the player scrolls or left/right clicks on
visible element of a non-focused ZScreen, that ZScreen will be given focus. This a visible element of a non-focused ZScreen, that ZScreen will be given focus.
allows multiple DFHack GUI tools to be usable at the same time. If the mouse is This allows multiple DFHack GUI tools to be usable at the same time. If the
clicked away from the ZScreen widgets, that ZScreen loses focus. If no ZScreen mouse is clicked away from the ZScreen widgets, that ZScreen loses focus. If no
has focus, all input is passed directly through to the first underlying ZScreen has focus, all input is passed directly through to the first underlying
non-ZScreen viewscreen. non-ZScreen viewscreen.
For a ZScreen with keyboard focus, if :kbd:`Esc` or the right mouse button is For a ZScreen with keyboard focus, if :kbd:`Esc` or the right mouse button is

@ -787,7 +787,9 @@ end
function ZScreen:onInput(keys) function ZScreen:onInput(keys)
local has_mouse = self:isMouseOver() local has_mouse = self:isMouseOver()
if not self:hasFocus() then if not self:hasFocus() then
if (keys._MOUSE_L_DOWN or keys._MOUSE_R_DOWN) and has_mouse then if has_mouse and
(keys._MOUSE_L_DOWN or keys._MOUSE_R_DOWN or
keys.CONTEXT_SCROLL_UP or keys.CONTEXT_SCROLL_DOWN) then
self:raise() self:raise()
else else
self:sendInputToParent(keys) self:sendInputToParent(keys)
@ -818,10 +820,14 @@ function ZScreen:onInput(keys)
end end
local passit = self.pass_pause and keys.D_PAUSE local passit = self.pass_pause and keys.D_PAUSE
if not passit and self.pass_mouse_clicks then if not passit and self.pass_mouse_clicks then
for key in pairs(MOUSE_KEYS) do if keys.CONTEXT_SCROLL_UP or keys.CONTEXT_SCROLL_DOWN then
if keys[key] then passit = true
passit = true else
break for key in pairs(MOUSE_KEYS) do
if keys[key] then
passit = true
break
end
end end
end end
end end