Revision: 3714
http://skim-app.svn.sourceforge.net/skim-app/?rev=3714&view=rev
Author: hofman
Date: 2008-04-12 04:15:11 -0700 (Sat, 12 Apr 2008)
Log Message:
-----------
Just close side pane when hitting ESC when the side pane is front.
Modified Paths:
--------------
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
trunk/SKSideWindow.m
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2008-04-12 10:51:42 UTC (rev 3713)
+++ trunk/SKMainWindowController.h 2008-04-12 11:15:11 UTC (rev 3714)
@@ -373,6 +373,9 @@
- (BOOL)leftSidePaneIsOpen;
- (BOOL)rightSidePaneIsOpen;
+- (NSWindow *)leftSideWindow;
+- (NSWindow *)rightSideWindow;
+
- (void)displayOutlineView;
- (void)fadeInOutlineView;
- (void)displayThumbnailView;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2008-04-12 10:51:42 UTC (rev 3713)
+++ trunk/SKMainWindowController.m 2008-04-12 11:15:11 UTC (rev 3714)
@@ -1155,6 +1155,14 @@
return state == NSDrawerOpenState || state == NSDrawerOpeningState;
}
+- (NSWindow *)leftSideWindow {
+ return leftSideWindow;
+}
+
+- (NSWindow *)rightSideWindow {
+ return rightSideWindow;
+}
+
- (NSArray *)notes {
return notes;
}
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2008-04-12 10:51:42 UTC (rev 3713)
+++ trunk/SKSideWindow.m 2008-04-12 11:15:11 UTC (rev 3714)
@@ -182,7 +182,12 @@
unsigned modifierFlags = [theEvent modifierFlags] &
NSDeviceIndependentModifierFlagsMask;
if (ch == 0x1B && modifierFlags == 0) {
- [controller exitFullScreen:self];
+ if (self == [controller leftSideWindow] && [controller
leftSidePaneIsOpen])
+ [controller toggleLeftSidePane:self];
+ else if (self == [controller rightSideWindow] && [controller
rightSidePaneIsOpen])
+ [controller toggleRightSidePane:self];
+ else
+ [controller exitFullScreen:self];
} else if (ch == 'p' && modifierFlags == 0 && [controller isPresentation])
{
[controller toggleLeftSidePane:self];
} else {
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 the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
