callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gdkwindow: Respect cairo surfaces with device scale

Browse Source 
If a cairo_surface for a window has a device scale set we need
to respect this when creating a similar window. I.e. we want
to then automatically create a larger window which inherits
the scale from the original.

We also need to calculate a different device_offset if there
is a device_scale set.
This commit is contained in:
Alexander Larsson 2013-06-04 10:41:44 +02:00
parent 1b1f2b4b52
commit 56bec0c70c
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gdk/gdkwindow.c
View File

@ -2757,6 +2757,7 @@ gdk_window_begin_paint_region (GdkWindow *window,
GdkWindowImplClass *impl_class; GdkWindowImplClass *impl_class;
GdkWindowPaint *paint; GdkWindowPaint *paint;
GSList *list; GSList *list;
double sx, sy;
gboolean needs_surface; gboolean needs_surface;
g_return_if_fail (GDK_IS_WINDOW (window)); g_return_if_fail (GDK_IS_WINDOW (window));
@ -2783,7 +2784,11 @@ gdk_window_begin_paint_region (GdkWindow *window,
gdk_window_get_content (window), gdk_window_get_content (window),
MAX (clip_box.width, 1), MAX (clip_box.width, 1),
MAX (clip_box.height, 1)); MAX (clip_box.height, 1));
cairo_surface_set_device_offset (paint->surface, -clip_box.x, -clip_box.y); sx = sy = 1;
#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
cairo_surface_get_device_scale (paint->surface, &sx, &sy);
#endif
cairo_surface_set_device_offset (paint->surface, -clip_box.x*sx, -clip_box.y*sy);
} }
for (list = window->paint_stack; list != NULL; list = list->next) for (list = window->paint_stack; list != NULL; list = list->next)
@ -9198,10 +9203,18 @@ gdk_window_create_similar_surface (GdkWindow * window,
int height) int height)
{ {
cairo_surface_t *window_surface, *surface; cairo_surface_t *window_surface, *surface;
double sx, sy;
g_return_val_if_fail (GDK_IS_WINDOW (window), NULL); g_return_val_if_fail (GDK_IS_WINDOW (window), NULL);
window_surface = gdk_window_ref_impl_surface (window); window_surface = gdk_window_ref_impl_surface (window);
sx = sy = 1;
#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
cairo_surface_get_device_scale (window_surface, &sx, &sy);
#endif
width = width * sx;
height = height * sy;
switch (_gdk_rendering_mode) switch (_gdk_rendering_mode)
{ {
@ -9224,6 +9237,10 @@ gdk_window_create_similar_surface (GdkWindow * window,
break; break;
} }
#ifdef HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE
cairo_surface_set_device_scale (surface, sx, sy);
#endif
cairo_surface_destroy (window_surface); cairo_surface_destroy (window_surface);
return surface; return surface;