From 0ca4891ee093cc6ad4248a70397c93e940059e5c Mon Sep 17 00:00:00 2001 From: Richard Hult Date: Thu, 31 Jan 2008 14:05:47 +0000 Subject: [PATCH] Another attempt at fixing focus issues with undecorated windows. Revert 2008-01-31 Richard Hult * 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. svn path=/trunk/; revision=19445 --- ChangeLog | 8 ++++++++ gdk/quartz/GdkQuartzView.c | 18 ++---------------- gdk/quartz/GdkQuartzView.h | 4 ---- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2504bd2386..f543b1a23d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-01-31 Richard Hult + + * 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. + 2008-01-30 Sven Neumann * gdk/directfb/gdkdrawable-directfb.c diff --git a/gdk/quartz/GdkQuartzView.c b/gdk/quartz/GdkQuartzView.c index cabbcbe5ad..7395a8cceb 100644 --- a/gdk/quartz/GdkQuartzView.c +++ b/gdk/quartz/GdkQuartzView.c @@ -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 diff --git a/gdk/quartz/GdkQuartzView.h b/gdk/quartz/GdkQuartzView.h index 1da55e3773..29172e4382 100644 --- a/gdk/quartz/GdkQuartzView.h +++ b/gdk/quartz/GdkQuartzView.h @@ -30,7 +30,3 @@ -(GdkWindow *)gdkWindow; @end - - - -