AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Invalidate cairo surface if resizing is not supported for target

Browse Source 
While X11 surfaces can be resized, this is not the case for Quartz
surfaces.  Instead of resizing we will invalidate the surface instead.
By giving _gdk_windowing_set_cairo_surface_size() a boolean return
value, we can signal back whether or not resizing was possible.  If not
possible, we invalidate the surface.
This commit is contained in:
Kristian Rietveld 2010-08-08 18:17:29 +02:00 committed by Benjamin Otte
parent 9c6696dfcc
commit d819bc4814
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gdk/gdkinternals.h
View File

@ -511,9 +511,9 @@ void _gdk_display_pointer_info_foreach (GdkDisplay *display,
void _gdk_window_invalidate_for_expose (GdkWindow *window,
cairo_region_t *region);
void _gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
int width,
int height);
gboolean _gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
int width,
int height);
cairo_surface_t * _gdk_windowing_create_cairo_surface (GdkDrawable *drawable,
int width,

17
gdk/gdkwindow.c
View File

@ -1054,11 +1054,18 @@ recompute_visible_regions_internal (GdkWindowObject *private,
width = private->abs_x + private->width;
height = private->abs_y + private->height;
_gdk_windowing_set_cairo_surface_size (private->cairo_surface,
width, height);
cairo_surface_set_device_offset (private->cairo_surface,
private->abs_x,
private->abs_y);
if (_gdk_windowing_set_cairo_surface_size (private->cairo_surface,
width, height))
{
cairo_surface_set_device_offset (private->cairo_surface,
private->abs_x,
private->abs_y);
}
else
{
cairo_surface_destroy (private->cairo_surface);
private->cairo_surface = NULL;
}
}
}

3
gdk/quartz/gdkdrawable-quartz.c
View File

@ -32,12 +32,13 @@ typedef struct {
CGContextRef cg_context;
} GdkQuartzCairoSurfaceData;
void
gboolean
_gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
int width,
int height)
{
/* This is not supported with quartz surfaces. */
return FALSE;
}
static void

3
gdk/win32/gdkdrawable-win32.c
View File

@ -670,12 +670,13 @@ gdk_win32_ref_cairo_surface (GdkDrawable *drawable)
return impl->cairo_surface;
}
void
gboolean
_gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
gint width,
gint height)
{
// Do nothing. The surface size is determined by the DC
return FALSE;
}
static gint

3
gdk/x11/gdkdrawable-x11.c
View File

@ -461,12 +461,13 @@ gdk_x11_cairo_surface_destroy (void *data)
impl->cairo_surface = NULL;
}
void
gboolean
_gdk_windowing_set_cairo_surface_size (cairo_surface_t *surface,
int width,
int height)
{
cairo_xlib_surface_set_size (surface, width, height);
return TRUE;
}
cairo_surface_t *