add convenience function to get 1x and 2x images

benfry · benfry · commit dbd68d2b2089 · 2015-09-22T09:48:45.000-04:00
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
@@ -667,6 +667,12 @@ public Image loadImage(String filename) {
   }
 
 
+  public Image loadImageX(String filename) {
+    final int res = Toolkit.highResDisplay() ? 2 : 1;
+    return loadImage(filename + "-" + res +  "x.png");
+  }
+
+
 //  public EditorButton loadButton(String name) {
 //    return new EditorButton(this, name);
 //  }
diff --git a/app/src/processing/app/ui/EditorButton.java b/app/src/processing/app/ui/EditorButton.java
@@ -77,12 +77,11 @@ public EditorButton(EditorToolbar parent, String name,
 
     Mode mode = toolbar.mode;
 
-    final int res = Toolkit.highResDisplay() ? 2 : 1;
-    disabledImage = mode.loadImage(name + "-disabled-" + res + "x.png");
-    enabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
-    selectedImage = mode.loadImage(name + "-selected-" + res + "x.png");
-    pressedImage = mode.loadImage(name + "-pressed-" + res + "x.png");
-    rolloverImage = mode.loadImage(name + "-rollover-" + res + "x.png");
+    disabledImage = mode.loadImageX(name + "-disabled");
+    enabledImage = mode.loadImageX(name + "-enabled");
+    selectedImage = mode.loadImageX(name + "-selected");
+    pressedImage = mode.loadImageX(name + "-pressed");
+    rolloverImage = mode.loadImageX(name + "-rollover");
 
     if (disabledImage == null) {
       disabledImage = enabledImage;
diff --git a/app/src/processing/app/ui/EditorFooter.java b/app/src/processing/app/ui/EditorFooter.java
@@ -340,9 +340,8 @@ class Tab {
 
       if (icon != null) {
         Mode mode = editor.getMode();
-        final int res = Toolkit.highResDisplay() ? 2 : 1;
-        enabledIcon = mode.loadImage(icon + "-enabled-" + res + "x.png");
-        selectedIcon = mode.loadImage(icon + "-selected-" + res + "x.png");
+        enabledIcon = mode.loadImageX(icon + "-enabled");
+        selectedIcon = mode.loadImageX(icon + "-selected");
         if (selectedIcon == null) {
           selectedIcon = enabledIcon;  // use this as the default
         }
