Revision: 2956
http://skim-app.svn.sourceforge.net/skim-app/?rev=2956&view=rev
Author: hofman
Date: 2007-09-21 04:33:30 -0700 (Fri, 21 Sep 2007)
Log Message:
-----------
Hide hover window when closing left side drawer.
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2007-09-21 08:41:36 UTC (rev 2955)
+++ trunk/SKMainWindowController.m 2007-09-21 11:33:30 UTC (rev 2956)
@@ -1896,7 +1896,7 @@
- (IBAction)toggleLeftSidePane:(id)sender {
if ([self isFullScreen]) {
[[SKPDFHoverWindow sharedHoverWindow] hide];
- if ([leftSideWindow state] == NSDrawerOpenState || [leftSideWindow
state] == NSDrawerOpeningState)
+ if ([self leftSidePaneIsOpen])
[leftSideWindow collapse];
else
[leftSideWindow expand];
@@ -1906,16 +1906,18 @@
else
[self showLeftSideWindowOnScreen:[[self window] screen]];
} else if (usesDrawers) {
- int state = [leftSideDrawer state];
- if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
+ if ([self leftSidePaneIsOpen]) {
+ if (leftSidePaneState == SKOutlineSidePaneState || [[searchField
stringValue] length])
+ [[SKPDFHoverWindow sharedHoverWindow] hide];
[leftSideDrawer close];
- else
+ } else {
[leftSideDrawer openOnEdge:NSMinXEdge];
+ }
} else {
NSRect sideFrame = [leftSideContentBox frame];
NSRect pdfFrame = [pdfSplitView frame];
- if (NSWidth(sideFrame) > 0.0) {
+ if ([self leftSidePaneIsOpen]) {
if (leftSidePaneState == SKOutlineSidePaneState || [[searchField
stringValue] length])
[[SKPDFHoverWindow sharedHoverWindow] hide];
lastLeftSidePaneWidth = NSWidth(sideFrame); // cache this
@@ -1940,13 +1942,17 @@
- (IBAction)toggleRightSidePane:(id)sender {
if ([self isFullScreen]) {
- if ([rightSideWindow state] == NSDrawerOpenState || [rightSideWindow
state] == NSDrawerOpeningState)
+ if ([self rightSidePaneIsOpen])
[rightSideWindow collapse];
else
[rightSideWindow expand];
+ } else if ([self isPresentation]) {
+ if ([rightSideWindow isVisible])
+ [self hideRightSideWindow];
+ else
+ [self showRightSideWindowOnScreen:[[self window] screen]];
} else if (usesDrawers) {
- int state = [rightSideDrawer state];
- if (state == NSDrawerOpenState || state == NSDrawerOpeningState)
+ if ([self rightSidePaneIsOpen])
[rightSideDrawer close];
else
[rightSideDrawer openOnEdge:NSMaxXEdge];
@@ -1954,7 +1960,7 @@
NSRect sideFrame = [rightSideContentBox frame];
NSRect pdfFrame = [pdfSplitView frame];
- if (NSWidth(sideFrame) > 1.0) {
+ if ([self rightSidePaneIsOpen]) {
lastRightSidePaneWidth = NSWidth(sideFrame); // cache this
pdfFrame.size.width += lastRightSidePaneWidth;
sideFrame.size.width = 0.0;
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 2005.
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
