Revision: 4921
http://skim-app.svn.sourceforge.net/skim-app/?rev=4921&view=rev
Author: hofman
Date: 2008-11-06 22:29:34 +0000 (Thu, 06 Nov 2008)
Log Message:
-----------
Only switch key window when sliding in/out side window if the side window /
fullscreen window was key
Modified Paths:
--------------
trunk/SKSideWindow.m
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2008-11-06 22:17:31 UTC (rev 4920)
+++ trunk/SKSideWindow.m 2008-11-06 22:29:34 UTC (rev 4921)
@@ -111,7 +111,8 @@
if (state == NSDrawerOpenState || state == NSDrawerOpeningState) {
state = NSDrawerClosingState;
[self animateToWidth:WINDOW_OFFSET];
- [[controller window] makeKeyAndOrderFront:self];
+ if ([self isKeyWindow])
+ [[controller window] makeKeyAndOrderFront:self];
state = NSDrawerClosedState;
}
}
@@ -120,7 +121,10 @@
if (state == NSDrawerClosedState || state == NSDrawerClosingState) {
state = NSDrawerOpeningState;
[self animateToWidth:NSWidth([[[self contentView] contentView] frame])
+ CONTENT_INSET];
- [self makeKeyAndOrderFront:nil];
+ if ([[controller window] isKeyWindow])
+ [self makeKeyAndOrderFront:nil];
+ else
+ [self orderFront:nil];
state = NSDrawerOpenState;
}
}
@@ -153,7 +157,6 @@
- (void)expand {
[[self contentView] setAcceptsMouseOver:NO];
[self slideIn];
- [self makeKeyAndOrderFront:nil];
}
- (void)collapse {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
