Revision: 12899
http://sourceforge.net/p/skim-app/code/12899
Author: hofman
Date: 2022-05-07 18:06:18 +0000 (Sat, 07 May 2022)
Log Message:
-----------
reduce check for validation of actual/physicalsize menu items
Modified Paths:
--------------
trunk/SKMainToolbarController.m
trunk/SKMainWindowController_UI.m
trunk/SKPDFView.m
trunk/SKSecondaryPDFView.m
trunk/SKSnapshotPDFView.m
trunk/SKSnapshotWindowController.m
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKMainToolbarController.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -1024,7 +1024,7 @@
if ([[toolbarItem toolbar] customizationPaletteIsRunning]) {
return NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomActualItemIdentifier]) {
- return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && ([mainController.pdfView autoScales] ||
fabs([mainController.pdfView scaleFactor] - 1.0 ) > 0.01);
+ return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && ([mainController.pdfView autoScales] ||
fabs([mainController.pdfView scaleFactor] - 1.0) > 0.0);
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToFitItemIdentifier]) {
return [mainController.pdfView.document isLocked] == NO &&
[mainController hasOverview] == NO && [mainController.pdfView autoScales] == NO;
} else if ([identifier
isEqualToString:SKDocumentToolbarZoomToSelectionItemIdentifier]) {
Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKMainWindowController_UI.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -1744,9 +1744,9 @@
} else if (action == @selector(doZoomOut:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [pdfView canZoomOut];
} else if (action == @selector(doZoomToActualSize:)) {
- return [[self pdfDocument] isLocked] == NO && ([pdfView autoScales] ||
fabs([pdfView scaleFactor] - 1.0 ) > 0.01);
+ return [[self pdfDocument] isLocked] == NO && ([pdfView autoScales] ||
fabs([pdfView scaleFactor] - 1.0) > 0.0);
} else if (action == @selector(doZoomToPhysicalSize:)) {
- return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && ([pdfView
autoScales] || fabs([pdfView physicalScaleFactor] - 1.0 ) > 0.01);
+ return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO && ([pdfView
autoScales] || fabs([pdfView physicalScaleFactor] - 1.0 ) > 0.001);
} else if (action == @selector(doZoomToSelection:)) {
return [self interactionMode] != SKPresentationMode && [self
hasOverview] == NO && [[self pdfDocument] isLocked] == NO &&
(NSIsEmptyRect([pdfView currentSelectionRect]) == NO || [pdfView toolMode] !=
SKSelectToolMode);
} else if (action == @selector(doZoomToFit:)) {
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKPDFView.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -3232,7 +3232,7 @@
[menuItem setState:[self extendedDisplayMode] ==
kPDFDisplayHorizontalContinuous ? NSOnState : NSOffState];
return YES;
} else if (action == @selector(zoomToPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0 ) > 0.01) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
return YES;
} else if (action == @selector(editActiveAnnotation:)) {
return [[self activeAnnotation] isEditable];
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKSecondaryPDFView.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -615,10 +615,10 @@
[menuItem setState:[self displaysPageBreaks] ? NSOnState : NSOffState];
return YES;
} else if ([menuItem action] == @selector(doActualSize:)) {
- [menuItem setState:fabs([self scaleFactor] - 1.0) < 0.1 ? NSOnState :
NSOffState];
+ [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ? NSOffState :
NSOnState];
return YES;
} else if ([menuItem action] == @selector(doPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0 ) > 0.01) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
return YES;
} else if ([menuItem action] == @selector(changeToolMode:)) {
[menuItem setState:[self selectsText] == (BOOL)[menuItem tag] ?
NSOnState : NSOffState];
Modified: trunk/SKSnapshotPDFView.m
===================================================================
--- trunk/SKSnapshotPDFView.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKSnapshotPDFView.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -560,10 +560,10 @@
[menuItem setState:[self autoFits] ? NSOnState : NSOffState];
return [self shouldAutoFit];
} else if ([menuItem action] == @selector(doActualSize:)) {
- [menuItem setState:fabs([self scaleFactor] - 1.0) < 0.1 ? NSOnState :
NSOffState];
+ [menuItem setState:fabs([self scaleFactor] - 1.0) > 0.0 ? NSOffState :
NSOnState];
return YES;
} else if ([menuItem action] == @selector(doPhysicalSize:)) {
- [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0 ) > 0.01) ? NSOffState : NSOnState];
+ [menuItem setState:([self autoScales] || fabs([self
physicalScaleFactor] - 1.0) > 0.001) ? NSOffState : NSOnState];
return YES;
} else if ([[SKSnapshotPDFView superclass]
instancesRespondToSelector:_cmd]) {
return [super validateMenuItem:menuItem];
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2022-05-07 17:45:42 UTC (rev 12898)
+++ trunk/SKSnapshotWindowController.m 2022-05-07 18:06:18 UTC (rev 12899)
@@ -467,9 +467,9 @@
} else if (action == @selector(doZoomOut:)) {
return [pdfView canZoomOut];
} else if (action == @selector(doZoomToActualSize:)) {
- return fabs([pdfView scaleFactor] - 1.0 ) > 0.01;
+ return fabs([pdfView scaleFactor] - 1.0) > 0.0;
} else if (action == @selector(doZoomToPhysicalSize:)) {
- return fabs([pdfView physicalScaleFactor] - 1.0 ) > 0.01;
+ return fabs([pdfView physicalScaleFactor] - 1.0) > 0.001;
} else if (action == @selector(toggleAutoScale:)) {
[menuItem setState:[pdfView autoFits] ? NSOnState : NSOffState];
return YES;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
