Revision: 5764
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5764&view=rev
Author:   hofman
Date:     2009-09-19 21:35:14 +0000 (Sat, 19 Sep 2009)

Log Message:
-----------
disable toggling fullscreen and presentation mode while fading out the 
fullscreen window, otherwise we may end up without a fullscreen window

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2009-09-19 17:41:58 UTC (rev 5763)
+++ trunk/SKMainWindowController.h      2009-09-19 21:35:14 UTC (rev 5764)
@@ -237,6 +237,7 @@
         unsigned int updatingThumbnailSelection:1;
         unsigned int isAnimating:1;
         unsigned int isFadingOut:1;
+        unsigned int isChangingFullScreen:1;
         unsigned int findPanelFind:1;
         unsigned int caseInsensitiveSearch:1;
         unsigned int wholeWordSearch:1;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2009-09-19 17:41:58 UTC (rev 5763)
+++ trunk/SKMainWindowController.m      2009-09-19 21:35:14 UTC (rev 5764)
@@ -231,6 +231,8 @@
         markedPageIndex = NSNotFound;
         beforeMarkedPageIndex = NSNotFound;
         mwcFlags.isAnimating = 0;
+        mwcFlags.isFadingOut = 0;
+        mwcFlags.isChangingFullScreen = 0;
         mwcFlags.updatingColor = 0;
         mwcFlags.updatingFont = 0;
         mwcFlags.updatingLine = 0;
@@ -1499,7 +1501,7 @@
 }
 
 - (IBAction)enterFullScreen:(id)sender {
-    if ([self isFullScreen])
+    if ([self isFullScreen] || mwcFlags.isChangingFullScreen)
         return;
     
     NSScreen *screen = [[self window] screen] ?: [NSScreen mainScreen]; // @@ 
screen: or should we use the main screen?
@@ -1535,7 +1537,7 @@
 }
 
 - (IBAction)enterPresentation:(id)sender {
-    if ([self isPresentation])
+    if ([self isPresentation] || mwcFlags.isChangingFullScreen)
         return;
     
     BOOL wasFullScreen = [self isFullScreen];
@@ -1566,10 +1568,16 @@
     mwcFlags.isFadingOut = 0;
 }
 
+- (void)finishFadeOut {
+    mwcFlags.isChangingFullScreen = 0;
+}
+
 - (IBAction)exitFullScreen:(id)sender {
     if ([self isFullScreen] == NO && [self isPresentation] == NO)
         return;
-
+    
+    mwcFlags.isChangingFullScreen = 1;
+    
     if ([self isFullScreen])
         [self hideSideWindows];
     
@@ -1638,6 +1646,8 @@
     [mainWindow makeKeyWindow];
     
     [blankingWindows makeObjectsPerformSelector:@selector(fadeOut)];
+    
+    [self performSelector:@selector(finishFadeOut) withObject:nil 
afterDelay:0.5];
 }
 
 #pragma mark Swapping tables

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2009-09-19 17:41:58 UTC (rev 5763)
+++ trunk/SKMainWindowController_UI.m   2009-09-19 21:35:14 UTC (rev 5764)
@@ -1444,13 +1444,13 @@
             [menuItem setTitle:NSLocalizedString(@"Remove Full Screen", @"Menu 
item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Full Screen", @"Menu item 
title")];
-        return [[self pdfDocument] isLocked] == NO;
+        return [[self pdfDocument] isLocked] == NO && 
mwcFlags.isChangingFullScreen == 0;
     } else if (action == @selector(togglePresentation:)) {
         if ([self isPresentation])
             [menuItem setTitle:NSLocalizedString(@"Remove Presentation", 
@"Menu item title")];
         else
             [menuItem setTitle:NSLocalizedString(@"Presentation", @"Menu item 
title")];
-        return [[self pdfDocument] isLocked] == NO;
+        return [[self pdfDocument] isLocked] == NO && 
mwcFlags.isChangingFullScreen == 0;
     } else if (action == @selector(getInfo:)) {
         return [self isPresentation] == NO;
     } else if (action == @selector(performFit:)) {


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

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to