basic retina support for the PDE itself

benfry · benfry · commit eb6127b62745 · 2012-12-15T16:36:41.000Z
diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
@@ -163,7 +163,7 @@ public void paintComponent(Graphics screen) {
         offscreen = null;
 
       } else {
-        // who cares, just resize
+        // if the image is larger than necessary, no need to change
         sizeW = size.width;
         sizeH = size.height;
       }
@@ -174,7 +174,11 @@ public void paintComponent(Graphics screen) {
       sizeH = size.height;
       imageW = sizeW;
       imageH = sizeH;
-      offscreen = createImage(imageW, imageH);
+      if (Toolkit.isRetina()) {
+        offscreen = createImage(imageW*2, imageH*2);
+      } else {
+        offscreen = createImage(imageW, imageH);
+      }
     }
 
     Graphics g = offscreen.getGraphics();
@@ -183,8 +187,15 @@ public void paintComponent(Graphics screen) {
     fontAscent = metrics.getAscent();
 
     Graphics2D g2 = (Graphics2D) g;
-    g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                        RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+    
+    if (Toolkit.isRetina()) {
+      // scale everything 2x, will be scaled down when drawn to the screen
+      g2.scale(2, 2);
+    } else {
+      // don't anti-alias text in retina mode
+      g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                          RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+    }
 
     // set the background for the offscreen
     g.setColor(backgroundColor);
@@ -288,7 +299,7 @@ public void paintComponent(Graphics screen) {
     g.drawImage(pieces[popup.isVisible() ? SELECTED : UNSELECTED][MENU],
                 menuLeft, 0, null);
 
-    screen.drawImage(offscreen, 0, 0, null);
+    screen.drawImage(offscreen, 0, 0, imageW, imageH, null);
   }
 
 
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
@@ -185,7 +185,12 @@ public void paintComponent(Graphics screen) {
     Dimension size = getSize();
     if ((offscreen == null) ||
         (size.width != width) || (size.height != height)) {
-      offscreen = createImage(size.width, size.height);
+      if (Toolkit.isRetina()) {
+        offscreen = createImage(size.width*2, size.height*2);
+      } else {
+        offscreen = createImage(size.width, size.height);
+      }
+
       width = size.width;
       height = size.height;
 
@@ -205,19 +210,26 @@ public void paintComponent(Graphics screen) {
 //        offsetX = x2[i];
 //      }
     }
-    Graphics g = offscreen.getGraphics();
+    Graphics g = offscreen.getGraphics();    
+    Graphics2D g2 = (Graphics2D) g;
+    
+    if (Toolkit.isRetina()) {
+      // scale everything 2x, will be scaled down when drawn to the screen
+      g2.scale(2, 2);
+    } else {
+      // don't anti-alias text in retina mode
+      g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
+                          RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
+    }
+
     g.setColor(bgcolor); //getBackground());
     g.fillRect(0, 0, width, height);
 
-    Graphics2D g2 = (Graphics2D) g;
-    g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-                        RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-
 //    for (int i = 0; i < buttonCount; i++) {
 //      g.drawImage(stateImage[i], x1[i], y1, null);
 //    }
     for (Button b : buttons) {
-      g.drawImage(b.stateImage, b.left, TOP, null);
+      g.drawImage(b.stateImage, b.left, TOP, BUTTON_WIDTH, BUTTON_HEIGHT, null);
     }
 
     g.setColor(statusColor);
@@ -259,10 +271,11 @@ public void paintComponent(Graphics screen) {
     g.drawRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1);
     g.drawString(modeTitle, modeX1 + modeGapH, modeY2 - modeGapV);
 
-    screen.drawImage(offscreen, 0, 0, null);
-    
+    screen.drawImage(offscreen, 0, 0, size.width, size.height, null);
+
+    // dim things out when not enabled (not currently in use) 
     if (!isEnabled()) {
-      screen.setColor(new Color(0,0,0,100));
+      screen.setColor(new Color(0, 0, 0, 100));
       screen.fillRect(0, 0, getWidth(), getHeight());
     }
   }
diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
@@ -212,4 +212,22 @@ static public void beep() {
   static public Clipboard getSystemClipboard() {
     return awtToolkit.getSystemClipboard();
   }
+  
+  
+  static Boolean retinaProp; 
+  
+  static public boolean isRetina() {
+    if (Base.isMacOS()) {
+      // This should probably be reset each time there's a display change.
+      // A 5-minute search didn't turn up any such event in the Java API.
+      // Also, should we use the Toolkit associated with the editor window?
+      if (retinaProp == null) {
+        Float prop = (Float)
+          awtToolkit.getDesktopProperty("apple.awt.contentScaleFactor");
+        retinaProp = prop == 2;
+      }
+      return retinaProp;
+    }
+    return false;
+  }
 }
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
@@ -59,6 +59,9 @@
     <key>LSMinimumSystemVersion</key>
     <string>10.6.8</string>
 
+    <key>NSHighResolutionCapable</key>
+    <true/>
+
     <key>Java</key>
     <dict>
       <key>SplashFile</key>
