Revision: 3873
http://skim-app.svn.sourceforge.net/skim-app/?rev=3873&view=rev
Author: hofman
Date: 2008-05-13 09:22:08 -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-13 11:54:17 UTC (rev 3872)
+++ trunk/SKSideWindow.m 2008-05-13 16:22:08 UTC (rev 3873)
@@ -94,7 +94,12 @@
[[self contentView] setAcceptsMouseOver:YES];
}
-- (void)slideFromFrame:(NSRect)startFrame toFrame:(NSRect)endFrame {
+- (void)animateToWidth:(float)width {
+ NSRect screenFrame = [[[controller window] screen] frame];
+ NSRect endFrame, startFrame = [self frame];
+ endFrame = startFrame;
+ endFrame.size.width = width;
+ endFrame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) - width :
NSMinX(screenFrame);
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];
@@ -106,12 +111,7 @@
- (void)slideOut {
if (state == NSDrawerOpenState || state == NSDrawerOpeningState) {
state = NSDrawerClosingState;
- NSRect screenFrame = [[[controller window] screen] frame];
- NSRect endFrame, startFrame = [self frame];
- endFrame = startFrame;
- endFrame.size.width = WINDOW_OFFSET;
- endFrame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) -
WINDOW_OFFSET : NSMinX(screenFrame);
- [self slideFromFrame:startFrame toFrame:endFrame];
+ [self animateToWidth:WINDOW_OFFSET];
[[controller window] makeKeyAndOrderFront:self];
state = NSDrawerClosedState;
}
@@ -120,12 +120,7 @@
- (void)slideIn {
if (state == NSDrawerClosedState || state == NSDrawerClosingState) {
state = NSDrawerOpeningState;
- NSRect screenFrame = [[[controller window] screen] frame];
- NSRect endFrame, startFrame = [self frame];
- endFrame = startFrame;
- endFrame.size.width = NSWidth([[[self contentView] contentView]
frame]) + CONTENT_INSET;
- endFrame.origin.x = edge == NSMaxXEdge ? NSMaxX(screenFrame) -
NSWidth(endFrame) : NSMinX(screenFrame);
- [self slideFromFrame:startFrame toFrame:endFrame];
+ [self animateToWidth:NSWidth([[[self contentView] contentView] frame])
+ CONTENT_INSET];
[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
