diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2015-07-19 20:13:22 +0200 |
|---|---|---|
| committer | Christoph Reiter <creiter@src.gnome.org> | 2015-07-27 17:26:46 +0200 |
| commit | 2c329f5b3a9188411e148351fb93d60cfb2f227e (patch) | |
| tree | ce8d35f59978388f24b167e7dca49f06c958c665 /gdk/quartz | |
| parent | e0339c5244a7b92569b761076dc0e6577687069d (diff) | |
| download | gtk+-2c329f5b3a9188411e148351fb93d60cfb2f227e.tar.gz | |
quartz: disable system shadows if a GdkWindow shadow is set.
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
Diffstat (limited to 'gdk/quartz')
| -rw-r--r-- | gdk/quartz/gdkwindow-quartz.c | 20 | ||||
| -rw-r--r-- | gdk/quartz/gdkwindow-quartz.h | 2 |
2 files changed, 20 insertions, 2 deletions
diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c index 7d6bfe4dad..ff759d02e9 100644 --- a/gdk/quartz/gdkwindow-quartz.c +++ b/gdk/quartz/gdkwindow-quartz.c @@ -2133,6 +2133,19 @@ window_type_hint_to_hides_on_deactivate (GdkWindowTypeHint hint) } 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 gdk_quartz_window_set_type_hint (GdkWindow *window, GdkWindowTypeHint hint) { @@ -2150,7 +2163,7 @@ gdk_quartz_window_set_type_hint (GdkWindow *window, if (GDK_WINDOW_IS_MAPPED (window)) 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 setHidesOnDeactivate: window_type_hint_to_hides_on_deactivate (hint)]; } @@ -2393,7 +2406,8 @@ gdk_quartz_window_set_decorations (GdkWindow *window, backing:NSBackingStoreBuffered defer:NO 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)]; if (title) [impl->toplevel setTitle:title]; @@ -2825,6 +2839,8 @@ gdk_quartz_window_set_shadow_width (GdkWindow *window, return; 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 * diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h index ccd7633699..4c8347c9e5 100644 --- a/gdk/quartz/gdkwindow-quartz.h +++ b/gdk/quartz/gdkwindow-quartz.h @@ -62,6 +62,8 @@ struct _GdkWindowImplQuartz cairo_surface_t *cairo_surface; gint shadow_top; + + gint shadow_max; }; struct _GdkWindowImplQuartzClass |