diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:00:36 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-10-08 23:00:36 +1000 |
| commit | f23588de3c7085830614f6764a5c0cd262538afd (patch) | |
| tree | 6460aecbaf206dffcc4ffb546c4a8143025b82db /sway/input/cursor.c | |
| parent | Implement popup_during_fullscreen (diff) | |
| download | sway-f23588de3c7085830614f6764a5c0cd262538afd.tar.gz sway-f23588de3c7085830614f6764a5c0cd262538afd.tar.zst sway-f23588de3c7085830614f6764a5c0cd262538afd.zip | |
Introduce container_is_transient_for
Diffstat (limited to 'sway/input/cursor.c')
| -rw-r--r-- | sway/input/cursor.c | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 08eeb812..6d57c45f 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
| @@ -99,17 +99,13 @@ static struct sway_node *node_at_coords( | |||
| 99 | } | 99 | } |
| 100 | if (ws->fullscreen) { | 100 | if (ws->fullscreen) { |
| 101 | // Try transient containers | 101 | // Try transient containers |
| 102 | if (config->popup_during_fullscreen == POPUP_SMART && | 102 | for (int i = 0; i < ws->floating->length; ++i) { |
| 103 | ws->fullscreen->view) { | 103 | struct sway_container *floater = ws->floating->items[i]; |
| 104 | for (int i = 0; i < ws->floating->length; ++i) { | 104 | if (container_is_transient_for(floater, ws->fullscreen)) { |
| 105 | struct sway_container *floater = ws->floating->items[i]; | 105 | struct sway_container *con = tiling_container_at( |
| 106 | if (floater->view && view_is_transient_for( | 106 | &floater->node, lx, ly, surface, sx, sy); |
| 107 | floater->view, ws->fullscreen->view)) { | 107 | if (con) { |
| 108 | struct sway_container *con = tiling_container_at( | 108 | return &con->node; |
| 109 | &floater->node, lx, ly, surface, sx, sy); | ||
| 110 | if (con) { | ||
| 111 | return &con->node; | ||
| 112 | } | ||
| 113 | } | 109 | } |
| 114 | } | 110 | } |
| 115 | } | 111 | } |