gtk+ r19623 - in branches/gtk-2-12: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Wed Feb 20 20:12:45 2008
New Revision: 19623
URL: http://svn.gnome.org/viewvc/gtk+?rev=19623&view=rev

Log:
2008-02-20  Richard Hult  <richard imendio com>

	Merged from trunk:

	* gdk/quartz/gdkwindow-quartz.c: (gdk_window_set_decorations): Set
	the right window level and shadow after recreating the window.

	* gdk/quartz/GdkQuartzView.c: (drawRect): Invalidate the shadow if
	necessary after drawing (bug #517338).


Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gdk/quartz/GdkQuartzView.c
   branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c

Modified: branches/gtk-2-12/gdk/quartz/GdkQuartzView.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/GdkQuartzView.c	(original)
+++ branches/gtk-2-12/gdk/quartz/GdkQuartzView.c	Wed Feb 20 20:12:45 2008
@@ -116,6 +116,12 @@
 
   gdk_region_destroy (region);
 
+  /* Invalidate the window shadow for non-opaque views that have shadow
+   * enabled, otherwise the shadow doesn't get updated to what we draw.
+   */
+  if (![self isOpaque] && [[self window] hasShadow])
+    [[self window] invalidateShadow];
+
   GDK_QUARTZ_RELEASE_POOL;
 }
 

Modified: branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c
==============================================================================
--- branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c	(original)
+++ branches/gtk-2-12/gdk/quartz/gdkwindow-quartz.c	Wed Feb 20 20:12:45 2008
@@ -2530,6 +2530,9 @@
                                                    backing:NSBackingStoreBuffered
                                                      defer:NO];
 
+      [impl->toplevel setHasShadow: window_type_hint_to_shadow (impl->type_hint)];
+      [impl->toplevel setLevel: window_type_hint_to_level (impl->type_hint)];
+
       [impl->toplevel setContentView:old_view];
       [impl->toplevel setFrame:rect display:YES];
     }