Revision: 4883
http://skim-app.svn.sourceforge.net/skim-app/?rev=4883&view=rev
Author: hofman
Date: 2008-10-27 18:53:05 +0000 (Mon, 27 Oct 2008)
Log Message:
-----------
fix offset of zoom popup item for zoom in/out of zoomable pdf views
Modified Paths:
--------------
trunk/BDSKZoomablePDFView.m
trunk/SKSecondaryPDFView.m
Modified: trunk/BDSKZoomablePDFView.m
===================================================================
--- trunk/BDSKZoomablePDFView.m 2008-10-27 18:02:50 UTC (rev 4882)
+++ trunk/BDSKZoomablePDFView.m 2008-10-27 18:53:05 UTC (rev 4883)
@@ -257,7 +257,7 @@
[super zoomIn:sender];
[self setAutoFits:NO adjustPopup:YES];
}else{
- int cnt = 0, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
+ int cnt = 1, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
@@ -273,13 +273,13 @@
[super zoomOut:sender];
[self setAutoFits:NO adjustPopup:YES];
}else{
- int cnt = 0, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
+ int cnt = 1, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
BDSKDefaultScaleMenuFactors[cnt]) cnt++;
cnt--;
- if (cnt < 0) cnt++;
+ while (cnt < 1) cnt++;
[self setScaleFactor:BDSKDefaultScaleMenuFactors[cnt]];
}
}
@@ -287,7 +287,7 @@
- (BOOL)canZoomIn{
if ([super canZoomIn] == NO)
return NO;
- unsigned cnt = 0, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
+ unsigned cnt = 1, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
BDSKDefaultScaleMenuFactors[cnt]) cnt++;
@@ -297,11 +297,11 @@
- (BOOL)canZoomOut{
if ([super canZoomOut] == NO)
return NO;
- unsigned cnt = 0, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
+ unsigned cnt = 1, numberOfDefaultItems =
(sizeof(BDSKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
BDSKDefaultScaleMenuFactors[cnt]) cnt++;
- return cnt > 0;
+ return cnt > 1;
}
- (void)goToPage:(PDFPage *)aPage {
Modified: trunk/SKSecondaryPDFView.m
===================================================================
--- trunk/SKSecondaryPDFView.m 2008-10-27 18:02:50 UTC (rev 4882)
+++ trunk/SKSecondaryPDFView.m 2008-10-27 18:53:05 UTC (rev 4883)
@@ -300,7 +300,7 @@
}
- (IBAction)zoomIn:(id)sender{
- int cnt = 0, numberOfDefaultItems = (sizeof(SKDefaultScaleMenuFactors) /
sizeof(float));
+ int cnt = 1, numberOfDefaultItems = (sizeof(SKDefaultScaleMenuFactors) /
sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
@@ -311,20 +311,20 @@
}
- (IBAction)zoomOut:(id)sender{
- int cnt = 0, numberOfDefaultItems = (sizeof(SKDefaultScaleMenuFactors) /
sizeof(float));
+ int cnt = 1, numberOfDefaultItems = (sizeof(SKDefaultScaleMenuFactors) /
sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
SKDefaultScaleMenuFactors[cnt]) cnt++;
cnt--;
- if (cnt < 0) cnt++;
+ while (cnt < 1) cnt++;
[self setScaleFactor:SKDefaultScaleMenuFactors[cnt]];
}
- (BOOL)canZoomIn{
if ([super canZoomIn] == NO)
return NO;
- unsigned cnt = 0, numberOfDefaultItems =
(sizeof(SKDefaultScaleMenuFactors) / sizeof(float));
+ unsigned cnt = 1, numberOfDefaultItems =
(sizeof(SKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
SKDefaultScaleMenuFactors[cnt]) cnt++;
@@ -334,11 +334,11 @@
- (BOOL)canZoomOut{
if ([super canZoomOut] == NO)
return NO;
- unsigned cnt = 0, numberOfDefaultItems =
(sizeof(SKDefaultScaleMenuFactors) / sizeof(float));
+ unsigned cnt = 1, numberOfDefaultItems =
(sizeof(SKDefaultScaleMenuFactors) / sizeof(float));
float scaleFactor = [self scaleFactor];
// We only work with some preset zoom values, so choose one of the
appropriate values (Fudge a little for floating point == to work)
while (cnt < numberOfDefaultItems && scaleFactor * .99 >
SKDefaultScaleMenuFactors[cnt]) cnt++;
- return cnt > 0;
+ return cnt > 1;
}
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 the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
