diff options
| author | Marek Chalupa <mchqwerty@gmail.com> | 2015-10-09 18:17:07 +0200 |
|---|---|---|
| committer | Derek Foreman <derekf@osg.samsung.com> | 2015-10-09 15:24:04 -0500 |
| commit | 6ce78992a04b572fc036c2f33cd3727a6ad14da3 (patch) | |
| tree | 171a93a80b73bfbee5089edb88e62a3f05e981ff /desktop-shell | |
| parent | f7bb9352f7d2a17419b4ff8fa800a34da5148c0b (diff) | |
| download | weston-6ce78992a04b572fc036c2f33cd3727a6ad14da3.tar.gz | |
shell: fix maximizing windows on a secondary output
commit f814c5dc9 changed get_output_work_area behaviour
which broke the code for positioning maximized window.
The x position was set to 2*output->x instead of to output->x
fix https://bugs.freedesktop.org/show_bug.cgi?id=92357
Signed-off-by: Marek Chalupa <mchqwerty@gmail.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
Diffstat (limited to 'desktop-shell')
| -rw-r--r-- | desktop-shell/shell.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/desktop-shell/shell.c b/desktop-shell/shell.c index a355b489..3eb3f5c0 100644 --- a/desktop-shell/shell.c +++ b/desktop-shell/shell.c @@ -5573,7 +5573,6 @@ set_maximized_position(struct desktop_shell *shell, { int32_t surf_x, surf_y; pixman_rectangle32_t area; - pixman_box32_t *e; get_output_work_area(shell, shsurf->output, &area); if (shsurf->has_set_geometry) { @@ -5583,11 +5582,10 @@ set_maximized_position(struct desktop_shell *shell, surface_subsurfaces_boundingbox(shsurf->surface, &surf_x, &surf_y, NULL, NULL); } - e = pixman_region32_extents(&shsurf->output->region); weston_view_set_position(shsurf->view, - e->x1 + area.x - surf_x, - e->y1 + area.y - surf_y); + area.x - surf_x, + area.y - surf_y); } static void |