[Skim-app-commit] SF.net SVN: skim-app:[14450] trunk/SKMainWindowContro ller.m

[<ho...@us...>]

Revision: 14450
          http://sourceforge.net/p/skim-app/code/14450
Author:   hofman
Date:     2024-09-01 22:39:06 +0000 (Sun, 01 Sep 2024)
Log Message:
-----------
combine if's

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

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m	2024-09-01 22:36:51 UTC (rev 14449)
+++ trunk/SKMainWindowController.m	2024-09-01 22:39:06 UTC (rev 14450)
@@ -683,11 +683,10 @@
             NSString *units = useMetric ? NSLocalizedString(@"cm", @"size unit") : NSLocalizedString(@"in", @"size unit");
             CGFloat factor = useMetric ? CM_PER_POINT : INCH_PER_POINT;
             message = [NSString stringWithFormat:@"%.2f %C %.2f @ (%.2f, %.2f) %@", NSWidth(rect) * factor, MULTIPLICATION_SIGN_CHARACTER, NSHeight(rect) * factor, NSMinX(rect) * factor, NSMinY(rect) * factor, units];
+        } else if (floor(NSMinX(rect)) >= NSMinX(rect) && floor(NSMinY(rect)) >= NSMinY(rect) && floor(NSWidth(rect)) >= NSWidth(rect) && floor(NSHeight(rect)) >= NSHeight(rect)) {
+            message = [NSString stringWithFormat:@"%.0f %C %.0f @ (%.0f, %.0f) %@", NSWidth(rect), MULTIPLICATION_SIGN_CHARACTER, NSHeight(rect), NSMinX(rect), NSMinY(rect), NSLocalizedString(@"pt", @"size unit")];
         } else {
-            if (floor(NSMinX(rect)) >= NSMinX(rect) && floor(NSMinY(rect)) >= NSMinY(rect) && floor(NSWidth(rect)) >= NSWidth(rect) && floor(NSHeight(rect)) >= NSHeight(rect))
-                message = [NSString stringWithFormat:@"%.0f %C %.0f @ (%.0f, %.0f) %@", NSWidth(rect), MULTIPLICATION_SIGN_CHARACTER, NSHeight(rect), NSMinX(rect), NSMinY(rect), NSLocalizedString(@"pt", @"size unit")];
-            else
-                message = [NSString stringWithFormat:@"%.1f %C %.1f @ (%.1f, %.1f) %@", NSWidth(rect), MULTIPLICATION_SIGN_CHARACTER, NSHeight(rect), NSMinX(rect), NSMinY(rect), NSLocalizedString(@"pt", @"size unit")];
+            message = [NSString stringWithFormat:@"%.1f %C %.1f @ (%.1f, %.1f) %@", NSWidth(rect), MULTIPLICATION_SIGN_CHARACTER, NSHeight(rect), NSMinX(rect), NSMinY(rect), NSLocalizedString(@"pt", @"size unit")];
         }
     } else if (magnification > 0.0001) {
         message = [NSString stringWithFormat:@"%.2f %C", magnification, MULTIPLICATION_SIGN_CHARACTER];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.