mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

desktop-shell: refactor maximized size calculation into its own function

Browse Source 
We need to calculate maximized size to resolve a bug with unsetting
fullscreen, might as well share the code.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Daniel Stone <daniels@collabora.com>
This commit is contained in:
Derek Foreman 2017-10-06 14:37:44 -05:00 committed by Daniel Stone
parent 5c3f3575d5
commit 927d9e23fa
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
desktop-shell/shell.c
View File

@ -2584,6 +2584,19 @@ desktop_surface_committed(struct weston_desktop_surface *desktop_surface,
}
}
static void
get_maximized_size(struct shell_surface *shsurf, int32_t *width, int32_t *height)
{
struct desktop_shell *shell;
pixman_rectangle32_t area;
shell = shell_surface_get_shell(shsurf);
get_output_work_area(shell, shsurf->output, &area);
*width = area.width;
*height = area.height;
}
static void
set_fullscreen(struct shell_surface *shsurf, bool fullscreen,
struct weston_output *output)
@ -2689,8 +2702,6 @@ set_maximized(struct shell_surface *shsurf, bool maximized)
if (maximized) {
struct weston_output *output;
struct desktop_shell *shell;
pixman_rectangle32_t area;
if (!weston_surface_is_mapped(surface))
output = get_focused_output(surface->compositor);
@ -2699,11 +2710,7 @@ set_maximized(struct shell_surface *shsurf, bool maximized)
shell_surface_set_output(shsurf, output);
shell = shell_surface_get_shell(shsurf);
get_output_work_area(shell, shsurf->output, &area);
width = area.width;
height = area.height;
get_maximized_size(shsurf, &width, &height);
}
weston_desktop_surface_set_maximized(desktop_surface, maximized);
weston_desktop_surface_set_size(desktop_surface, width, height);