Revision: 3872
http://skim-app.svn.sourceforge.net/skim-app/?rev=3872&view=rev
Author: hofman
Date: 2008-05-13 04:54:17 -0700 (Tue, 13 May 2008)
Log Message:
-----------
Avoid some code duplication
Modified Paths:
--------------
trunk/SKSideWindow.m
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2008-05-12 20:27:35 UTC (rev 3871)
+++ trunk/SKSideWindow.m 2008-05-13 11:54:17 UTC (rev 3872)
@@ -94,6 +94,15 @@
[[self contentView] setAcceptsMouseOver:YES];
}
+- (void)slideFromFrame:(NSRect)startFrame toFrame:(NSRect)endFrame {
+ NSDictionary *slideDict = [NSDictionary dictionaryWithObjectsAndKeys:self,
NSViewAnimationTargetKey, [NSValue valueWithRect:startFrame],
NSViewAnimationStartFrameKey, [NSValue valueWithRect:endFrame],
NSViewAnimationEndFrameKey, nil];
+ NSViewAnimation *animation = [[NSViewAnimation alloc]
initWithViewAnimations:[NSArray arrayWithObjects:slideDict, nil]];
+ [animation setAnimationBlockingMode:NSAnimationBlocking];
+ [animation setDuration:[self animationResizeTime:endFrame]];
+ [animation startAnimation];
+ [animation release];
+}
+
- (void)slideOut {
if (state == NSDrawerOpenState || state == NSDrawerOpeningState) {
state = NSDrawerClosingState;
@@ -102,12 +111,7 @@
endFrame = startFrame;
endFrame.size.width = WINDOW_OFFSET;
endFrame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) -
WINDOW_OFFSET : NSMinX(screenFrame);
- NSDictionary *slideInDict = [NSDictionary
dictionaryWithObjectsAndKeys:self, NSViewAnimationTargetKey, [NSValue
valueWithRect:startFrame], NSViewAnimationStartFrameKey, [NSValue
valueWithRect:endFrame], NSViewAnimationEndFrameKey, nil];
- NSViewAnimation *animation = [[NSViewAnimation alloc]
initWithViewAnimations:[NSArray arrayWithObjects:slideInDict, nil]];
- [animation setAnimationBlockingMode:NSAnimationBlocking];
- [animation setDuration:[self animationResizeTime:endFrame]];
- [animation startAnimation];
- [animation release];
+ [self slideFromFrame:startFrame toFrame:endFrame];
[[controller window] makeKeyAndOrderFront:self];
state = NSDrawerClosedState;
}
@@ -121,12 +125,7 @@
endFrame = startFrame;
endFrame.size.width = NSWidth([[[self contentView] contentView]
frame]) + CONTENT_INSET;
endFrame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) -
NSWidth(endFrame) : NSMinX(screenFrame);
- NSDictionary *slideInDict = [NSDictionary
dictionaryWithObjectsAndKeys:self, NSViewAnimationTargetKey, [NSValue
valueWithRect:startFrame], NSViewAnimationStartFrameKey, [NSValue
valueWithRect:endFrame], NSViewAnimationEndFrameKey, nil];
- NSViewAnimation *animation = [[NSViewAnimation alloc]
initWithViewAnimations:[NSArray arrayWithObjects:slideInDict, nil]];
- [animation setAnimationBlockingMode:NSAnimationBlocking];
- [animation setDuration:[self animationResizeTime:endFrame]];
- [animation startAnimation];
- [animation release];
+ [self slideFromFrame:startFrame toFrame:endFrame];
[self makeKeyAndOrderFront:nil];
state = NSDrawerOpenState;
}
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: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
