diff options
| author |  emersion <contact@emersion.fr> | 2018-08-19 21:51:53 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-19 21:51:53 +0100 |
| commit | 8db6c68db640e8535ed71a0369323538f0910d7e (patch) | |
| tree | a04d9b9253984ad951e8c301538be2622a6a2b1b | |
| parent | Merge pull request #2478 from RyanDwyer/standardise-debug (diff) | |
| parent | Fix popup position when parent uses geometry (diff) | |
| download | sway-8db6c68db640e8535ed71a0369323538f0910d7e.tar.gz sway-8db6c68db640e8535ed71a0369323538f0910d7e.tar.zst sway-8db6c68db640e8535ed71a0369323538f0910d7e.zip | |
Merge pull request #2493 from RyanDwyer/fix-popup-position
Fix popup position when parent uses geometry
| -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 |