diff options
| author |  Drew DeVault <sir@cmpwn.com> | 2018-08-18 19:26:36 -0400 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-08-18 19:26:36 -0400 |
| commit | d0a24465d75cc7197ee253e1de9fa961071cd034 (patch) | |
| tree | 916f9f40b9f587d3cd24a8d7b2185b5c7808cfa4 /sway/desktop/output.c | |
| parent | Merge pull request #2484 from ianyfan/con-for-each-child-fix (diff) | |
| parent | Fix nitpick (diff) | |
| download | sway-d0a24465d75cc7197ee253e1de9fa961071cd034.tar.gz sway-d0a24465d75cc7197ee253e1de9fa961071cd034.tar.zst sway-d0a24465d75cc7197ee253e1de9fa961071cd034.zip | |
Merge pull request #2466 from RyanDwyer/geometry
Fix geometry
Diffstat (limited to 'sway/desktop/output.c')
| -rw-r--r-- | sway/desktop/output.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 43ed9793..1e4f196b 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
| @@ -144,15 +144,16 @@ void output_view_for_each_surface(struct sway_output *output, | |||
| 144 | .user_iterator = iterator, | 144 | .user_iterator = iterator, |
| 145 | .user_data = user_data, | 145 | .user_data = user_data, |
| 146 | .output = output, | 146 | .output = output, |
| 147 | .ox = view->swayc->current.view_x - output->swayc->current.swayc_x, | 147 | .ox = view->swayc->current.view_x - output->swayc->current.swayc_x |
| 148 | .oy = view->swayc->current.view_y - output->swayc->current.swayc_y, | 148 | - view->geometry.x, |
| 149 | .oy = view->swayc->current.view_y - output->swayc->current.swayc_y | ||
| 150 | - view->geometry.y, | ||
| 149 | .width = view->swayc->current.view_width, | 151 | .width = view->swayc->current.view_width, |
| 150 | .height = view->swayc->current.view_height, | 152 | .height = view->swayc->current.view_height, |
| 151 | .rotation = 0, // TODO | 153 | .rotation = 0, // TODO |
| 152 | }; | 154 | }; |
| 153 | 155 | ||
| 154 | view_for_each_surface(view, | 156 | view_for_each_surface(view, output_for_each_surface_iterator, &data); |
| 155 | output_for_each_surface_iterator, &data); | ||
| 156 | } | 157 | } |
| 157 | 158 | ||
| 158 | void output_view_for_each_popup(struct sway_output *output, | 159 | void output_view_for_each_popup(struct sway_output *output, |