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

desktop-shell: use output position in get_output_panel_size()

Browse Source 
The panel size calculation needs to take the output position into account
or it's only correct when the output is at 0, 0.

Signed-off-by: Derek Foreman <derekf@osg.samsung.com>
Reviewed-by: Bryce Harrington <bryce@osg.samsung.com>
This commit is contained in:
Derek Foreman 2015-04-15 12:23:55 -05:00 committed by Bryce Harrington
parent f814c5dc9d
commit 612341f1a6
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
desktop-shell/shell.c
View File

@ -424,13 +424,12 @@ get_output_panel_size(struct desktop_shell *shell,
switch (shell->panel_position) {
case DESKTOP_SHELL_PANEL_POSITION_TOP:
case DESKTOP_SHELL_PANEL_POSITION_BOTTOM:
weston_view_to_global_float(view,
view->surface->width, 0,
&x, &y);
*width = (int) x;
*height = view->surface->height + (int) y;
*width = (int)x - output->x;
*height = view->surface->height + (int) y - output->y;
return;
case DESKTOP_SHELL_PANEL_POSITION_LEFT:
@ -439,8 +438,8 @@ get_output_panel_size(struct desktop_shell *shell,
0, view->surface->height,
&x, &y);
*width = view->surface->width + (int) x;
*height = (int) y;
*width = view->surface->width + (int)x - output->x;
*height = (int)y - output->y;
return;
default: