brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wayland/xdg-shell: Scale configure relative popup coordinate

Browse Source 
The parent local popup coordinate needs to be scaled according to the
monitor scale it is assigned.

https://bugzilla.gnome.org/show_bug.cgi?id=771841
This commit is contained in:
Jonas Ådahl 2016-09-23 17:18:21 +08:00
parent c0c132a320
commit a3d7ae6214
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wayland/meta-wayland-xdg-shell.c
View File

@ -874,6 +874,7 @@ xdg_popup_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role
MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface_role); MetaWaylandXdgPopup *xdg_popup = META_WAYLAND_XDG_POPUP (shell_surface_role);
MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup); MetaWaylandXdgSurface *xdg_surface = META_WAYLAND_XDG_SURFACE (xdg_popup);
MetaWindow *parent_window = xdg_popup->parent_surface->window; MetaWindow *parent_window = xdg_popup->parent_surface->window;
int monitor_scale;
int x, y; int x, y;
/* If the parent surface was destroyed, its window will be destroyed /* If the parent surface was destroyed, its window will be destroyed
@ -887,8 +888,9 @@ xdg_popup_role_configure (MetaWaylandSurfaceRoleShellSurface *shell_surface_role
if (!parent_window) if (!parent_window)
return; return;
x = new_x - parent_window->rect.x; monitor_scale = meta_window_wayland_get_main_monitor_scale (parent_window);
y = new_y - parent_window->rect.y; x = (new_x - parent_window->rect.x) / monitor_scale;
y = (new_y - parent_window->rect.y) / monitor_scale;
zxdg_popup_v6_send_configure (xdg_popup->resource, zxdg_popup_v6_send_configure (xdg_popup->resource,
x, y, new_width, new_height); x, y, new_width, new_height);
meta_wayland_xdg_surface_send_configure (xdg_surface); meta_wayland_xdg_surface_send_configure (xdg_surface);