alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2219 from RedSoxFan/fix-2111

Browse source 
Send pointer button events for keyboard-interactive layer surfaces
This commit is contained in:
Drew DeVault 2018-07-06 04:56:59 -07:00 committed by GitHub
parent 84109431f7 c833ae64bc
commit ddbf437794
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
sway/input/cursor.c
View file

@ -255,14 +255,12 @@ void dispatch_cursor_button(struct sway_cursor *cursor,
wlr_layer_surface_from_wlr_surface(surface); wlr_layer_surface_from_wlr_surface(surface);
if (layer->current.keyboard_interactive) { if (layer->current.keyboard_interactive) {
seat_set_focus_layer(cursor->seat, layer); seat_set_focus_layer(cursor->seat, layer);
return;
}
} }
} else if (surface && cont && cont->type != C_VIEW) {
// Avoid moving keyboard focus from a surface that accepts it to one // Avoid moving keyboard focus from a surface that accepts it to one
// that does not unless the change would move us to a new workspace. // that does not unless the change would move us to a new workspace.
// //
// This prevents, for example, losing focus when clicking on swaybar. // This prevents, for example, losing focus when clicking on swaybar.
if (surface && cont && cont->type != C_VIEW) {
struct sway_container *new_ws = cont; struct sway_container *new_ws = cont;
if (new_ws && new_ws->type != C_WORKSPACE) { if (new_ws && new_ws->type != C_WORKSPACE) {
new_ws = container_parent(new_ws, C_WORKSPACE); new_ws = container_parent(new_ws, C_WORKSPACE);