Revision: 5750
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5750&view=rev
Author:   hofman
Date:     2009-09-14 15:28:21 +0000 (Mon, 14 Sep 2009)

Log Message:
-----------
don't allow the main window to close when it has no delegate, probably busy 
removing fullscreen. Make main window key only after removing the fullscreen 
windows.

Modified Paths:
--------------
    trunk/SKMainWindow.m
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindow.m
===================================================================
--- trunk/SKMainWindow.m        2009-09-14 15:11:23 UTC (rev 5749)
+++ trunk/SKMainWindow.m        2009-09-14 15:28:21 UTC (rev 5750)
@@ -58,4 +58,9 @@
     [super resignKeyWindow];
 }
 
+- (void)performClose:(id)sender {
+    if ([self delegate])
+        [super performClose:sender];
+}
+
 @end

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-09-14 15:11:23 UTC (rev 5749)
+++ trunk/SKMainWindowController.m      2009-09-14 15:28:21 UTC (rev 5750)
@@ -1620,12 +1620,12 @@
     [fullScreenWindow setDelegate:nil];
     [self setWindow:mainWindow];
     [mainWindow orderWindow:NSWindowBelow relativeTo:[fullScreenWindow 
windowNumber]];
-    [mainWindow makeKeyWindow];
     [mainWindow display];
     [fullScreenWindow fadeOutBlocking:NO];
     [mainWindow makeFirstResponder:pdfView];
     [mainWindow recalculateKeyViewLoop];
     [mainWindow setDelegate:self];
+    [mainWindow makeKeyWindow];
     
     [blankingWindows makeObjectsPerformSelector:@selector(fadeOut)];
 }


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day 
trial. Simplify your report design, integration and deployment - and focus on 
what you do best, core application coding. Discover what's new with 
Crystal Reports now.  http://p.sf.net/sfu/bobj-july
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to