Revision: 7452
http://skim-app.svn.sourceforge.net/skim-app/?rev=7452&view=rev
Author: hofman
Date: 2011-08-29 10:12:02 +0000 (Mon, 29 Aug 2011)
Log Message:
-----------
Enable zoom to actual/physical size menu items when autoscaling, because it is
relevant
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_UI.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2011-08-27 21:51:57 UTC (rev 7451)
+++ trunk/SKMainToolbarController.m 2011-08-29 10:12:02 UTC (rev 7452)
@@ -773,7 +773,7 @@
if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
return NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
- return [mainController.pdfView.document isLocked] == NO &&
fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01;
+ return [mainController.pdfView.document isLocked] == NO &&
([mainController.pdfView autoScales] || fabs([mainController.pdfView
scaleFactor] - 1.0 ) > 0.01);
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2011-08-27 21:51:57 UTC (rev 7451)
+++ trunk/SKMainWindowController_UI.m 2011-08-29 10:12:02 UTC (rev 7452)
@@ -1458,9 +1458,9 @@
} else if (action == @selector(doZoomOut:)) {
return [self interactionMode] != SKPresentationMode && [pdfView
canZoomOut];
} else if (action == @selector(doZoomToActualSize:)) {
- return [[self pdfDocument] isLocked] == NO && fabs([pdfView
scaleFactor] - 1.0 ) > 0.01;
+ return [[self pdfDocument] isLocked] == NO && ([pdfView autoScales] ||
fabs([pdfView scaleFactor] - 1.0 ) > 0.01);
} else if (action == @selector(doZoomToPhysicalSize:)) {
- return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO && fabs([pdfView physicalScaleFactor] - 1.0 ) >
0.01;
+ return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO && ([pdfView autoScales] || fabs([pdfView
physicalScaleFactor] - 1.0 ) > 0.01);
} else if (action == @selector(doZoomToSelection:)) {
return [self interactionMode] != SKPresentationMode && [[self
pdfDocument] isLocked] == NO && NSIsEmptyRect([pdfView currentSelectionRect])
== NO;
} else if (action == @selector(doZoomToFit:)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
