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

Revert "wayland-surface: Apply the surface scale only if needed"

Browse Source 
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
This commit is contained in:
Adel Gadllah 2014-10-25 12:26:19 +02:00
parent 9d0c9f1f42
commit a8eb42e43c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wayland/meta-wayland-surface.c
View File

@ -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);