Revision: 6622
http://skim-app.svn.sourceforge.net/skim-app/?rev=6622&view=rev
Author: hofman
Date: 2010-07-16 15:23:45 +0000 (Fri, 16 Jul 2010)
Log Message:
-----------
don't remove nav window as child window in orderOut:, as that is called when
the app hides, which I think is wrong
Modified Paths:
--------------
trunk/SKNavigationWindow.m
trunk/SKPDFView.m
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2010-07-16 11:11:13 UTC (rev 6621)
+++ trunk/SKNavigationWindow.m 2010-07-16 15:23:45 UTC (rev 6622)
@@ -185,7 +185,6 @@
}
- (void)orderOut:(id)sender {
- [[self parentWindow] removeChildWindow:self];
[[SKNavigationToolTipWindow sharedToolTipWindow] orderOut:nil];
[super orderOut:sender];
}
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-07-16 11:11:13 UTC (rev 6621)
+++ trunk/SKPDFView.m 2010-07-16 15:23:45 UTC (rev 6622)
@@ -2408,6 +2408,7 @@
- (void)handleWindowWillCloseNotification:(NSNotification *)notification {
if ([self isEditing] && [self commitEditing] == NO)
[self discardEditing];
+ [[navWindow parentWindow] removeChildWindow:navWindow];
[navWindow orderOut:self];
}
@@ -2416,6 +2417,7 @@
// always recreate the navWindow, since moving between screens of
different resolution can mess up the location (in spite of moveToScreen:)
if (navWindow != nil) {
+ [[navWindow parentWindow] removeChildWindow:navWindow];
[navWindow orderOut:nil];
[navWindow release];
} else {
@@ -2434,6 +2436,7 @@
[self showNavWindow:NO];
[self doAutohide:NO];
+ [[navWindow parentWindow] removeChildWindow:navWindow];
[navWindow orderOut:self];
}
@@ -2442,8 +2445,10 @@
return;
if (interactionMode == SKPresentationMode)
[NSCursor setHiddenUntilMouseMoves:YES];
- if (interactionMode != SKNormalMode)
+ if (interactionMode != SKNormalMode) {
+ [[navWindow parentWindow] removeChildWindow:navWindow];
[navWindow fadeOut];
+ }
}
- (void)doAutohide:(BOOL)flag {
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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit