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

quartz: disable system shadows if a GdkWindow shadow is set.

Browse Source 
The shadow will be drawn in the wrong place in those cases so all we can
do is disable it. This fixes double shadows drawn around menus, popups
and tooltips.

https://bugzilla.gnome.org/show_bug.cgi?id=734984
This commit is contained in:
Christoph Reiter 2015-07-19 20:13:22 +02:00 committed by Christoph Reiter
parent e0339c5244
commit 2c329f5b3a
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gdk/quartz/gdkwindow-quartz.c
View File

@ -2132,6 +2132,19 @@ window_type_hint_to_hides_on_deactivate (GdkWindowTypeHint hint)
return FALSE; return FALSE;
} }
static void
_gdk_quartz_window_update_has_shadow (GdkWindowImplQuartz *impl)
{
gboolean has_shadow;
/* In case there is any shadow set we have to turn off the
* NSWindow setHasShadow as the system drawn ones wont match our
* window boundary anymore */
has_shadow = (window_type_hint_to_shadow (impl->type_hint) && !impl->shadow_max);
[impl->toplevel setHasShadow: has_shadow];
}
static void static void
gdk_quartz_window_set_type_hint (GdkWindow *window, gdk_quartz_window_set_type_hint (GdkWindow *window,
GdkWindowTypeHint hint) GdkWindowTypeHint hint)
@ -2150,7 +2163,7 @@ gdk_quartz_window_set_type_hint (GdkWindow *window,
if (GDK_WINDOW_IS_MAPPED (window)) if (GDK_WINDOW_IS_MAPPED (window))
return; return;
[impl->toplevel setHasShadow: window_type_hint_to_shadow (hint)]; _gdk_quartz_window_update_has_shadow (impl);
[impl->toplevel setLevel: window_type_hint_to_level (hint)]; [impl->toplevel setLevel: window_type_hint_to_level (hint)];
[impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (hint)]; [impl->toplevel setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (hint)];
} }
@ -2393,7 +2406,8 @@ gdk_quartz_window_set_decorations (GdkWindow *window,
backing:NSBackingStoreBuffered backing:NSBackingStoreBuffered
defer:NO defer:NO
screen:screen]; screen:screen];
[impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)]; _gdk_quartz_window_update_has_shadow (impl);
[impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)]; [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
if (title) if (title)
[impl->toplevel setTitle:title]; [impl->toplevel setTitle:title];
@ -2825,6 +2839,8 @@ gdk_quartz_window_set_shadow_width (GdkWindow *window,
return; return;
impl->shadow_top = top; impl->shadow_top = top;
impl->shadow_max = MAX (MAX (left, right), MAX (top, bottom));
_gdk_quartz_window_update_has_shadow (impl);
} }
static cairo_region_t * static cairo_region_t *

2
gdk/quartz/gdkwindow-quartz.h
View File

@ -62,6 +62,8 @@ struct _GdkWindowImplQuartz
cairo_surface_t *cairo_surface; cairo_surface_t *cairo_surface;
gint shadow_top; gint shadow_top;
gint shadow_max;
}; };
struct _GdkWindowImplQuartzClass struct _GdkWindowImplQuartzClass