Revision: 6663
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6663&view=rev
Author:   hofman
Date:     2010-07-31 12:11:10 +0000 (Sat, 31 Jul 2010)

Log Message:
-----------
pass blocking mode instead of boolean

Modified Paths:
--------------
    trunk/SKFullScreenWindow.m

Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m  2010-07-30 21:45:16 UTC (rev 6662)
+++ trunk/SKFullScreenWindow.m  2010-07-31 12:11:10 UTC (rev 6663)
@@ -42,6 +42,7 @@
 #import "NSEvent_SKExtensions.h"
 #import "SKStringConstants.h"
 
+#define DURATION 0.25
 
 @implementation SKFullScreenWindow
 
@@ -90,7 +91,7 @@
     [self setAlphaValue:1.0];
 }
 
-- (void)fadeOutBlocking:(BOOL)block {
+- (void)fadeOutWithBlockingMode:(NSAnimationBlockingMode)blockingMode {
     if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKDisableAnimationsKey]) {
         [self orderOut:nil];
     } else {
@@ -98,14 +99,14 @@
         animation = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray 
arrayWithObjects:fadeOutDict, nil]];
         [fadeOutDict release];
         
-        [animation setAnimationBlockingMode:block ? NSAnimationBlocking : 
NSAnimationNonblockingThreaded];
-        [animation setDuration:0.25];
+        [animation setAnimationBlockingMode:blockingMode];
+        [animation setDuration:DURATION];
         [animation setDelegate:self];
         [animation startAnimation];
     }
 }
 
-- (void)fadeInBlocking:(BOOL)block {
+- (void)fadeInWithBlockingMode:(NSAnimationBlockingMode)blockingMode {
     if ([[NSUserDefaults standardUserDefaults] 
boolForKey:SKDisableAnimationsKey]) {
         [self orderFront:nil];
     } else {
@@ -116,27 +117,27 @@
         [self setAlphaValue:0.0];
         [super orderFront:nil];
         
-        [animation setAnimationBlockingMode:block ? NSAnimationBlocking : 
NSAnimationNonblockingThreaded];
-        [animation setDuration:0.25];
+        [animation setAnimationBlockingMode:blockingMode];
+        [animation setDuration:DURATION];
         [animation setDelegate:self];
         [animation startAnimation];
     }
 }
 
 - (void)fadeOutBlocking {
-    [self fadeOutBlocking:YES];
+    [self fadeOutWithBlockingMode:NSAnimationBlocking];
 }
 
 - (void)fadeOut {
-    [self fadeOutBlocking:NO];
+    [self fadeOutWithBlockingMode:NSAnimationNonblockingThreaded];
 }
 
 - (void)fadeInBlocking {
-    [self fadeInBlocking:YES];
+    [self fadeInWithBlockingMode:NSAnimationBlocking];
 }
 
 - (void)fadeIn {
-    [self fadeInBlocking:NO];
+    [self fadeInWithBlockingMode:NSAnimationNonblockingThreaded];
 }
 
 - (void)animationDidEnd:(NSAnimation *)anAnimation {


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

------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to