Revision: 6707
http://skim-app.svn.sourceforge.net/skim-app/?rev=6707&view=rev
Author: hofman
Date: 2010-08-17 14:58:20 +0000 (Tue, 17 Aug 2010)
Log Message:
-----------
don't set PDF view settings in exitPresentationMode, to avoid doing it twice
when switching to full screen mode
Modified Paths:
--------------
trunk/SKMainWindowController.m
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2010-08-17 14:41:43 UTC (rev 6706)
+++ trunk/SKMainWindowController.m 2010-08-17 14:58:20 UTC (rev 6707)
@@ -1308,7 +1308,6 @@
activityAssertionID = kIOPMNullAssertionID;
NSScrollView *scrollView = [[pdfView documentView] enclosingScrollView];
- [self applyPDFSettings:savedNormalSetup];
[scrollView setHasHorizontalScroller:[[savedNormalSetup
objectForKey:HASHORIZONTALSCROLLER_KEY] boolValue]];
[scrollView setHasVerticalScroller:[[savedNormalSetup
objectForKey:HASVERTICALSCROLLER_KEY] boolValue]];
[scrollView setAutohidesScrollers:[[savedNormalSetup
objectForKey:AUTOHIDESSCROLLERS_KEY] boolValue]];
@@ -1443,7 +1442,7 @@
[[self window] setLevel:NSNormalWindowLevel];
[pdfView setBackgroundColor:backgroundColor];
[secondaryPdfView setBackgroundColor:backgroundColor];
- [self applyPDFSettings:fullScreenSetup];
+ [self applyPDFSettings:[fullScreenSetup count] ? fullScreenSetup :
savedNormalSetup];
[pdfView layoutDocumentView];
[pdfView setNeedsDisplay:YES];
} else {
@@ -1544,14 +1543,14 @@
[contentView addSubview:view];
[pdfView setBackgroundColor:backgroundColor];
[secondaryPdfView setBackgroundColor:backgroundColor];
- [pdfView layoutDocumentView];
- [pdfView setNeedsDisplay:YES];
if (wasInteractionMode == SKPresentationMode)
[self exitPresentationMode];
- else
- [self applyPDFSettings:savedNormalSetup];
+ [self applyPDFSettings:savedNormalSetup];
+ [pdfView layoutDocumentView];
+ [pdfView setNeedsDisplay:YES];
+
if ([[[self pdfView] currentPage] isEqual:page] == NO)
[[self pdfView] goToPage:page];
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
Make an app they can't live without
Enter the BlackBerry Developer Challenge
http://p.sf.net/sfu/RIM-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit