isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-08 17:44:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

wayland/xdg-shell: Scale positioner coordinates

Browse Source 
When the monitor is scaled (i.e. HiDPI scaling) the placement coordinates
ere still in unscaled xdg_surface window geometry coordinate space when
used to place the window. Fix this by scaling the coordinates by the
monitor scale of the parent toplevel window before using them.

https://bugzilla.gnome.org/show_bug.cgi?id=771841
This commit is contained in:
Jonas Ådahl 2016-10-13 13:56:00 +08:00
parent 43a1ac3b5f
commit ffea28e05d
1 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,6 +109,11 @@ struct _MetaWaylandXdgPopup
struct { struct {
MetaWaylandSurface *parent_surface; MetaWaylandSurface *parent_surface;
/*
* The coordinates/dimensions in the placement rule are in logical pixel
* coordinate space, i.e. not scaled given what monitor the popup is on.
*/
MetaPlacementRule placement_rule; MetaPlacementRule placement_rule;
MetaWaylandSeat *grab_seat; MetaWaylandSeat *grab_seat;
@ -757,6 +762,22 @@ meta_wayland_xdg_toplevel_class_init (MetaWaylandXdgToplevelClass *klass)
xdg_toplevel_role_shell_client_destroyed; xdg_toplevel_role_shell_client_destroyed;
} }
static void
scale_placement_rule (MetaPlacementRule *placement_rule,
MetaWaylandSurface *surface)
{
int monitor_scale = surface->window->monitor->scale;
placement_rule->anchor_rect.x *= monitor_scale;
placement_rule->anchor_rect.y *= monitor_scale;
placement_rule->anchor_rect.width *= monitor_scale;
placement_rule->anchor_rect.height *= monitor_scale;
placement_rule->offset_x *= monitor_scale;
placement_rule->offset_y *= monitor_scale;
placement_rule->width *= monitor_scale;
placement_rule->height *= monitor_scale;
}
static void static void
finish_popup_setup (MetaWaylandXdgPopup *xdg_popup) finish_popup_setup (MetaWaylandXdgPopup *xdg_popup)
{ {
@ -764,14 +785,13 @@ finish_popup_setup (MetaWaylandXdgPopup *xdg_popup)
MetaWaylandSurface *surface = MetaWaylandSurface *surface =
meta_wayland_surface_role_get_surface (surface_role); meta_wayland_surface_role_get_surface (surface_role);
MetaWaylandSurface *parent_surface; MetaWaylandSurface *parent_surface;
MetaPlacementRule placement_rule; MetaPlacementRule scaled_placement_rule;
MetaWaylandSeat *seat; MetaWaylandSeat *seat;
uint32_t serial; uint32_t serial;
MetaDisplay *display = meta_get_display (); MetaDisplay *display = meta_get_display ();
MetaWindow *window; MetaWindow *window;
parent_surface = xdg_popup->setup.parent_surface; parent_surface = xdg_popup->setup.parent_surface;
placement_rule = xdg_popup->setup.placement_rule;
seat = xdg_popup->setup.grab_seat; seat = xdg_popup->setup.grab_seat;
serial = xdg_popup->setup.grab_serial; serial = xdg_popup->setup.grab_serial;
@ -795,7 +815,10 @@ finish_popup_setup (MetaWaylandXdgPopup *xdg_popup)
window = meta_window_wayland_new (display, surface); window = meta_window_wayland_new (display, surface);
meta_wayland_surface_set_window (surface, window); meta_wayland_surface_set_window (surface, window);
meta_window_update_monitor (window, FALSE); meta_window_update_monitor (window, FALSE);
meta_window_place_with_placement_rule (window, &placement_rule);
scaled_placement_rule = xdg_popup->setup.placement_rule;
scale_placement_rule (&scaled_placement_rule, surface);
meta_window_place_with_placement_rule (window, &scaled_placement_rule);
if (seat) if (seat)
{ {