gtk+ r19445 - in trunk: . gdk/quartz

[rhult svn gnome org]

Author: rhult
Date: Thu Jan 31 14:05:47 2008
New Revision: 19445
URL: http://svn.gnome.org/viewvc/gtk+?rev=19445&view=rev

Log:
2008-01-31  Richard Hult  <richard imendio com>

	* gdk/quartz/GdkQuartzView.c: Another attempt at fixing focus
	issues with undecorated windows. Revert the change done on
	2008-01-25 and fix it by using the view's bounds instead. The
	bounds will always be up to date when setting up the tracking
	rect, so this should be more robust.


Modified:
   trunk/ChangeLog
   trunk/gdk/quartz/GdkQuartzView.c
   trunk/gdk/quartz/GdkQuartzView.h

Modified: trunk/gdk/quartz/GdkQuartzView.c
==============================================================================
--- trunk/gdk/quartz/GdkQuartzView.c	(original)
+++ trunk/gdk/quartz/GdkQuartzView.c	Thu Jan 31 14:05:47 2008
@@ -141,7 +141,7 @@
    * NSPointInRect ([[self window] convertScreenToBase:[NSEvent mouseLocation]], rect)
    */
 
-  rect = NSMakeRect (0, 0, impl->width, impl->height);
+  rect = [self bounds];
   trackingRect = [self addTrackingRect:rect
                                  owner:self
                               userData:nil
@@ -167,22 +167,8 @@
 
 -(void)setBounds:(NSRect)bounds
 {
-  NSRect old_bounds;
-  gboolean changed = FALSE;
-
-  old_bounds = [self bounds];
-  if (old_bounds.origin.x != bounds.origin.x ||
-      old_bounds.origin.y != bounds.origin.y ||
-      old_bounds.size.width != bounds.size.width ||
-      old_bounds.size.height != bounds.size.height)
-    {
-      changed = TRUE;
-    }
-  
   [super setBounds:bounds];
-
-  if (changed)
-    [self updateTrackingRect];
+  [self updateTrackingRect];
 }
 
 @end

Modified: trunk/gdk/quartz/GdkQuartzView.h
==============================================================================
--- trunk/gdk/quartz/GdkQuartzView.h	(original)
+++ trunk/gdk/quartz/GdkQuartzView.h	Thu Jan 31 14:05:47 2008
@@ -30,7 +30,3 @@
 -(GdkWindow *)gdkWindow;
 
 @end
-
-
-
-