From a43ca7b5b1c41242f45974f35ecda05dbdd29f71 Mon Sep 17 00:00:00 2001 From: Adel Gadllah Date: Sat, 25 Oct 2014 12:26:19 +0200 Subject: [PATCH] Revert "wayland-surface: Apply the surface scale only if needed" This commit is wrong, it assumes that the scale only applies to the one set by the client but its not. meta_surface_actor_wayland_scale_texture also handles the output scale. Revert the commit to fix hidpi for wayland clients like weston-terminal. This reverts commit 0364ea91403cfc1c675c2776dda50aff4fb3788b. https://bugzilla.gnome.org/show_bug.cgi?id=739161 --- src/wayland/meta-wayland-surface.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/wayland/meta-wayland-surface.c b/src/wayland/meta-wayland-surface.c index c61598b33..cda727c47 100644 --- a/src/wayland/meta-wayland-surface.c +++ b/src/wayland/meta-wayland-surface.c @@ -393,10 +393,7 @@ commit_pending_state (MetaWaylandSurface *surface, } if (pending->scale > 0) - { - surface->scale = pending->scale; - meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor)); - } + surface->scale = pending->scale; if (!cairo_region_is_empty (pending->damage)) surface_process_damage (surface, pending->damage); @@ -415,6 +412,9 @@ commit_pending_state (MetaWaylandSurface *surface, meta_surface_actor_set_input_region (surface->surface_actor, pending->input_region); } + /* scale surface texture */ + meta_surface_actor_wayland_scale_texture (META_SURFACE_ACTOR_WAYLAND (surface->surface_actor)); + /* wl_surface.frame */ wl_list_insert_list (&compositor->frame_callbacks, &pending->frame_callback_list); wl_list_init (&pending->frame_callback_list);