Revision: 6873
http://skim-app.svn.sourceforge.net/skim-app/?rev=6873&view=rev
Author: hofman
Date: 2010-10-13 09:50:14 +0000 (Wed, 13 Oct 2010)
Log Message:
-----------
save normal PDF settings before switching to fullscreen or presentation mode,
otherwise we won't save the correct settings
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2010-10-12 13:01:47 UTC (rev 6872)
+++ trunk/SKMainWindowController.m 2010-10-13 09:50:14 UTC (rev 6873)
@@ -1291,6 +1291,9 @@
- (void)enterPresentationMode {
NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
+ [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
hasHorizontalScroller]] forKey:HASHORIZONTALSCROLLER_KEY];
+ [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
hasVerticalScroller]] forKey:HASVERTICALSCROLLER_KEY];
+ [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
autohidesScrollers]] forKey:AUTOHIDESSCROLLERS_KEY];
// Set up presentation mode
[pdfView setBackgroundColor:[NSColor clearColor]];
[pdfView setAutoScales:YES];
@@ -1323,13 +1326,6 @@
}
- (void)fadeInFullScreenWindowWithBackgroundColor:(NSColor *)backgroundColor
level:(NSInteger)level {
- // remember normal setup to return to
- NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
- [savedNormalSetup setDictionary:[self currentPDFSettings]];
- [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
hasHorizontalScroller]] forKey:HASHORIZONTALSCROLLER_KEY];
- [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
hasVerticalScroller]] forKey:HASVERTICALSCROLLER_KEY];
- [savedNormalSetup setObject:[NSNumber numberWithBool:[scrollView
autohidesScrollers]] forKey:AUTOHIDESSCROLLERS_KEY];
-
if ([[mainWindow firstResponder] isDescendantOf:pdfSplitView])
[mainWindow makeFirstResponder:nil];
@@ -1436,6 +1432,10 @@
mwcFlags.isSwitchingFullScreen = 1;
+ // remember normal setup to return to, we must do this before changing the
interactionMode
+ if (wasInteractionMode == SKNormalMode)
+ [savedNormalSetup setDictionary:[self currentPDFSettings]];
+
interactionMode = SKFullScreenMode;
if (wasInteractionMode == SKPresentationMode) {
@@ -1489,6 +1489,10 @@
NSInteger level = [[NSUserDefaults standardUserDefaults]
boolForKey:SKUseNormalLevelForPresentationKey] ? NSNormalWindowLevel :
NSPopUpMenuWindowLevel;
PDFPage *page = [[self pdfView] currentPage];
+ // remember normal setup to return to, we must do this before changing the
interactionMode
+ if (wasInteractionMode == SKNormalMode)
+ [savedNormalSetup setDictionary:[self currentPDFSettings]];
+
mwcFlags.isSwitchingFullScreen = 1;
interactionMode = SKPresentationMode;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Beautiful is writing same markup. Internet Explorer 9 supports
standards for HTML5, CSS3, SVG 1.1, ECMAScript5, and DOM L2 & L3.
Spend less time writing and rewriting code and more time creating great
experiences on the web. Be a part of the beta today.
http://p.sf.net/sfu/beautyoftheweb
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit