Revision: 6706
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6706&view=rev
Author:   hofman
Date:     2010-08-17 14:41:43 +0000 (Tue, 17 Aug 2010)

Log Message:
-----------
only set scale factor from settings when there's no autoscaling

Modified Paths:
--------------
    trunk/SKMainWindowController.m

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-08-17 13:10:06 UTC (rev 6705)
+++ trunk/SKMainWindowController.m      2010-08-17 14:41:43 UTC (rev 6706)
@@ -552,10 +552,10 @@
 
 - (void)applyPDFSettings:(NSDictionary *)setup {
     NSNumber *number;
-    if (number = [setup objectForKey:SCALEFACTOR_KEY])
-        [pdfView setScaleFactor:[number doubleValue]];
     if (number = [setup objectForKey:AUTOSCALES_KEY])
         [pdfView setAutoScales:[number boolValue]];
+    if ([pdfView autoScales] == NO && (number = [setup 
objectForKey:SCALEFACTOR_KEY]))
+        [pdfView setScaleFactor:[number doubleValue]];
     if (number = [setup objectForKey:DISPLAYPAGEBREAKS_KEY])
         [pdfView setDisplaysPageBreaks:[number boolValue]];
     if (number = [setup objectForKey:DISPLAYASBOOK_KEY])


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

Reply via email to