mirror of
https://github.com/swaywm/sway.git
synced 2024-12-30 17:06:40 +01:00
parent
09354db878
commit
c7bced9329
1 changed files with 8 additions and 5 deletions
|
@ -710,6 +710,7 @@ static void handle_pointer_axis(struct sway_seat *seat,
|
||||||
|
|
||||||
// Scrolling on a tabbed or stacked title bar (handled as press event)
|
// Scrolling on a tabbed or stacked title bar (handled as press event)
|
||||||
if (!handled && (on_titlebar || on_titlebar_border)) {
|
if (!handled && (on_titlebar || on_titlebar_border)) {
|
||||||
|
struct sway_node *new_focus;
|
||||||
enum sway_container_layout layout = container_parent_layout(cont);
|
enum sway_container_layout layout = container_parent_layout(cont);
|
||||||
if (layout == L_TABBED || layout == L_STACKED) {
|
if (layout == L_TABBED || layout == L_STACKED) {
|
||||||
struct sway_node *tabcontainer = node_get_parent(node);
|
struct sway_node *tabcontainer = node_get_parent(node);
|
||||||
|
@ -726,15 +727,17 @@ static void handle_pointer_axis(struct sway_seat *seat,
|
||||||
|
|
||||||
struct sway_container *new_sibling_con = siblings->items[desired];
|
struct sway_container *new_sibling_con = siblings->items[desired];
|
||||||
struct sway_node *new_sibling = &new_sibling_con->node;
|
struct sway_node *new_sibling = &new_sibling_con->node;
|
||||||
struct sway_node *new_focus =
|
|
||||||
seat_get_focus_inactive(seat, new_sibling);
|
|
||||||
// Use the focused child of the tabbed/stacked container, not the
|
// Use the focused child of the tabbed/stacked container, not the
|
||||||
// container the user scrolled on.
|
// container the user scrolled on.
|
||||||
|
new_focus = seat_get_focus_inactive(seat, new_sibling);
|
||||||
|
} else {
|
||||||
|
new_focus = seat_get_focus_inactive(seat, &cont->node);
|
||||||
|
}
|
||||||
|
|
||||||
seat_set_focus(seat, new_focus);
|
seat_set_focus(seat, new_focus);
|
||||||
transaction_commit_dirty();
|
transaction_commit_dirty();
|
||||||
handled = true;
|
handled = true;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// Handle mouse bindings - x11 mouse buttons 4-7 - release event
|
// Handle mouse bindings - x11 mouse buttons 4-7 - release event
|
||||||
binding = get_active_mouse_binding(e, config->current_mode->mouse_bindings,
|
binding = get_active_mouse_binding(e, config->current_mode->mouse_bindings,
|
||||||
|
|
Loading…
Reference in a new issue