Carefully prioritize the available image scalings.

diff --git a/Library.mm b/Library.mm
index 8e23695059b3c7216b41aed1ceb3293ce67ae082..3372ddd69ca105959f1e04033277880404076df0 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -305,11 +305,17 @@ static NSArray *$useScale$(NSArray *files, bool use = true) {
         NSString *extension([file pathExtension]);
 
         if (use) {
-            for (unsigned scale(2); scale <= Scale_; ++scale) {
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]];
-                [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]];
+            if (Scale_ != 1) {
+                [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, Scale_, idiom, extension]];
+                [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, Scale_, extension]];
             }
 
+            for (unsigned scale(3); scale >= 2; --scale)
+                if (scale != Scale_) {
+                    [scaled addObject:[NSString stringWithFormat:@"%@@%ux~%@.%@", base, scale, idiom, extension]];
+                    [scaled addObject:[NSString stringWithFormat:@"%@@%ux.%@", base, scale, extension]];
+                }
+
             [scaled addObject:[NSString stringWithFormat:@"%@~%@.%@", base, idiom, extension]];
 
             // if (!IsWild_) <- support old themes