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

macos: remove duplicated opaque_region field

Browse Source 
This can be relied upon from GdkSurface and we do not need to keep a copy
of it. Just remove it and use the GdkSurface.opaque_region field.
This commit is contained in:
Christian Hergert 2022-02-25 13:14:22 -08:00 committed by Christian Hergert
parent 9767b3a97e
commit 94deb551aa
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gdk/macos/gdkmacossurface-private.h
View File

@ -49,7 +49,6 @@ struct _GdkMacosSurface
GdkMacosBuffer *buffer; GdkMacosBuffer *buffer;
GdkMacosBuffer *front; GdkMacosBuffer *front;
GPtrArray *monitors; GPtrArray *monitors;
cairo_region_t *opaque_region;
char *title; char *title;
int root_x; int root_x;

15
gdk/macos/gdkmacossurface.c
View File

@ -115,12 +115,6 @@ gdk_macos_surface_set_opaque_region (GdkSurface *surface,
g_assert (GDK_IS_MACOS_SURFACE (self)); g_assert (GDK_IS_MACOS_SURFACE (self));
if (region != self->opaque_region)
{
g_clear_pointer (&self->opaque_region, cairo_region_destroy);
self->opaque_region = cairo_region_copy (region);
}
if ((nsview = _gdk_macos_surface_get_view (GDK_MACOS_SURFACE (surface)))) if ((nsview = _gdk_macos_surface_get_view (GDK_MACOS_SURFACE (surface))))
[(GdkMacosView *)nsview setOpaqueRegion:region]; [(GdkMacosView *)nsview setOpaqueRegion:region];
} }
@ -417,7 +411,6 @@ gdk_macos_surface_destroy (GdkSurface *surface,
} }
g_clear_pointer (&self->title, g_free); g_clear_pointer (&self->title, g_free);
g_clear_pointer (&self->opaque_region, cairo_region_destroy);
if (window != NULL) if (window != NULL)
[window close]; [window close];
@ -619,14 +612,16 @@ _gdk_macos_surface_get_shadow (GdkMacosSurface *self,
gboolean gboolean
_gdk_macos_surface_is_opaque (GdkMacosSurface *self) _gdk_macos_surface_is_opaque (GdkMacosSurface *self)
{ {
GdkSurface *surface = (GdkSurface *)self;
g_return_val_if_fail (GDK_IS_MACOS_SURFACE (self), FALSE); g_return_val_if_fail (GDK_IS_MACOS_SURFACE (self), FALSE);
if (self->opaque_region != NULL && if (surface->opaque_region != NULL &&
cairo_region_num_rectangles (self->opaque_region) == 1) cairo_region_num_rectangles (surface->opaque_region) == 1)
{ {
cairo_rectangle_int_t extents; cairo_rectangle_int_t extents;
cairo_region_get_extents (self->opaque_region, &extents); cairo_region_get_extents (surface->opaque_region, &extents);
return (extents.x == 0 && return (extents.x == 0 &&
extents.y == 0 && extents.y == 0 &&