diff options
| author |  Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-19 21:09:39 +1000 |
|---|---|---|
| committer | Ryan Dwyer <ryandwyer1@gmail.com> | 2018-08-19 21:09:39 +1000 |
| commit | 76bdb21ca9ea377a8196a33adfcd3077fbcc57c5 (patch) | |
| tree | b92712fd22aba54f7b3fbd30d9374fd2a997a9e5 /sway/desktop/output.c | |
| parent | Merge pull request #2487 from RyanDwyer/workspace-floating-list (diff) | |
| download | sway-76bdb21ca9ea377a8196a33adfcd3077fbcc57c5.tar.gz sway-76bdb21ca9ea377a8196a33adfcd3077fbcc57c5.tar.zst sway-76bdb21ca9ea377a8196a33adfcd3077fbcc57c5.zip | |
Fix popup position when parent uses geometry
Fixes #2489.
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 2253eb51..3d8bbff5 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -163,8 +163,10 @@ void output_view_for_each_popup(struct sway_output *output, | |||
| 163 | .user_iterator = iterator, | 163 | .user_iterator = iterator, |
| 164 | .user_data = user_data, | 164 | .user_data = user_data, |
| 165 | .output = output, | 165 | .output = output, |
| 166 | .ox = view->swayc->current.view_x - output->swayc->current.swayc_x, | 166 | .ox = view->swayc->current.view_x - output->swayc->current.swayc_x |
| 167 | .oy = view->swayc->current.view_y - output->swayc->current.swayc_y, | 167 | - view->geometry.x, |
| 168 | .oy = view->swayc->current.view_y - output->swayc->current.swayc_y | ||
| 169 | - view->geometry.y, | ||
| 168 | .width = view->swayc->current.view_width, | 170 | .width = view->swayc->current.view_width, |
| 169 | .height = view->swayc->current.view_height, | 171 | .height = view->swayc->current.view_height, |
| 170 | .rotation = 0, // TODO | 172 | .rotation = 0, // TODO |