Add console hiding button

GKFX · GKFX · commit 31033fd2fdef · 2017-06-07T15:37:32.000+01:00
diff --git a/app/src/processing/app/ui/Editor.java b/app/src/processing/app/ui/Editor.java
@@ -320,6 +320,17 @@ public BasicSplitPaneDivider createDefaultDivider() {
         status = new EditorStatus(this, Editor.this);
         return status;
       }
+
+
+      @Override
+      public void finishDraggingTo(int location) {
+        super.finishDraggingTo(location);
+        // JSplitPane issue: if you only make the lower component visible at
+        // the last minute, its minmum size is ignored.
+        if (location > splitPane.getMaximumDividerLocation()) {
+          splitPane.setDividerLocation(splitPane.getMaximumDividerLocation());
+        }
+      }
     });
 
     box.add(splitPane);
diff --git a/app/src/processing/app/ui/EditorStatus.java b/app/src/processing/app/ui/EditorStatus.java
@@ -78,14 +78,18 @@ public class EditorStatus extends BasicSplitPaneDivider {  //JPanel {
   String url;
   int rightEdge;
   int mouseX;
-  boolean urlRollover;
+  int rolloverState;
+  static final int ROLLOVER_NONE     = 0;
+  static final int ROLLOVER_URL      = 1;
+  static final int ROLLOVER_COLLAPSE = 2;
 
   Font font;
   FontMetrics metrics;
   int ascent;
 
   Image offscreen;
   int sizeW, sizeH;
+  boolean collapseState = false;
 
   int response;
 
@@ -108,19 +112,29 @@ public void mouseEntered(MouseEvent e) {
 
       @Override
       public void mousePressed(MouseEvent e) {
-        if (urlRollover) {
+        if (rolloverState == ROLLOVER_URL) {
           Platform.openURL(url);
+        } else if (rolloverState == ROLLOVER_COLLAPSE) {
+          collapse(!collapseState);
         }
       }
 
       @Override
       public void mouseExited(MouseEvent e) {
+        mouseX = -100;
         updateMouse();
       }
 
     });
 
     addMouseMotionListener(new MouseMotionAdapter() {
+      @Override
+      public void mouseDragged(MouseEvent e) {
+        // BasicSplitPaneUI.startDragging gets called even when you click but
+        // don't drag, so we can't expand the console whenever that gets called
+        // or the button wouldn't work.
+        collapse(false);
+      }
 
       @Override
       public void mouseMoved(MouseEvent e) {
@@ -131,11 +145,25 @@ public void mouseMoved(MouseEvent e) {
   }
 
 
+  void collapse(boolean doCollapse) {
+    if (collapseState == doCollapse) return;
+    collapseState = doCollapse;
+    editor.footer.setVisible(!doCollapse);
+    splitPane.resetToPreferredSizes();
+  }
+
+
   void updateMouse() {
-    if (urlRollover) {
+    switch (rolloverState) {
+    case ROLLOVER_URL:
       setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
-    } else {
+      break;
+    case ROLLOVER_COLLAPSE:
+      setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR));
+      break;
+    case ROLLOVER_NONE:
       setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR));
+      break;
     }
     repaint();
   }
@@ -257,6 +285,7 @@ public void stopIndeterminate() {
   }
 
 
+  private final Color whitishTint = new Color(0x40eeeeee, true);
   //public void paintComponent(Graphics screen) {
   public void paint(Graphics screen) {
 //    if (okButton == null) setup();
@@ -285,31 +314,37 @@ public void paint(Graphics screen) {
 
     g.drawImage(bgImage[mode], 0, 0, sizeW, sizeH, this);
 
-    g.setColor(fgColor[mode]);
+    // What's the mouse over?
+    final int H = getHeight();
+    int collapseLeftEdge = sizeW - H;
+    if (collapseLeftEdge < mouseX && mouseX < sizeW) {
+      rolloverState = ROLLOVER_COLLAPSE;
+    } else if ((message != null && url != null && mouseX > LEFT_MARGIN) &&
+        // calculate right edge of the text for rollovers (otherwise the pane
+        // cannot be resized up or down whenever a URL is being displayed)
+        mouseX < (LEFT_MARGIN + g.getFontMetrics().stringWidth(message))) {
+      rolloverState = ROLLOVER_URL;
+    } else {
+      rolloverState = ROLLOVER_NONE;
+    }
+
     // https://github.com/processing/processing/issues/3265
     if (message != null) {
       // needs to be set each time on osx
       g.setFont(font);
-      // calculate right edge of the text for rollovers (otherwise the pane
-      // cannot be resized up or down whenever a URL is being displayed)
-      rightEdge = LEFT_MARGIN + g.getFontMetrics().stringWidth(message);
       // set the highlight color on rollover so that the user's not surprised
       // to see the web browser open when they click
-      urlRollover = (url != null) &&
-        (mouseX > LEFT_MARGIN && mouseX < rightEdge);
-      if (urlRollover) {
-        g.setColor(urlColor);
-      }
+      g.setColor((rolloverState == ROLLOVER_URL) ? urlColor : fgColor[mode]);
       g.drawString(message, LEFT_MARGIN, (sizeH + ascent) / 2);
     }
 
     if (indeterminate) {
       //int x = cancelButton.getX();
       //int w = cancelButton.getWidth();
       int w = Toolkit.getButtonWidth();
-      int x = getWidth() - RIGHT_MARGIN - w;
-      int y = getHeight() / 3;
-      int h = getHeight() / 3;
+      int x = getWidth() - Math.max(RIGHT_MARGIN, (int)(H*1.2)) - w;
+      int y = H / 3;
+      int h = H / 3;
       g.setColor(new Color(0x80000000, true));
       g.drawRect(x, y, w, h);
       for (int i = 0; i < 10; i++) {
@@ -318,6 +353,27 @@ public void paint(Graphics screen) {
       }
     }
 
+    // draw collapse/expand button
+    int x = sizeW - H/3;
+    int y1, y2;
+    if (collapseState) {
+      y1 = 7*H/12;
+      y2 = 5*H/12;
+    } else {
+      y1 = 5*H/12;
+      y2 = 7*H/12;
+    }
+    if (rolloverState == ROLLOVER_COLLAPSE) {
+      g.setColor(whitishTint);
+      g.fillRect(sizeW - H, 0, H, H);
+      g.setColor(urlColor);
+    } else {
+      g.setColor(fgColor[mode]);
+    }
+    // nb 2*((H/6) + 1) is always even, so there's a nice tip on the triangle.
+    g.fillPolygon(new int[] {x, x - 2*((H/6) + 1), x - (H/6) - 1},
+      new int[] {y1, y1, y2}, 3);
+
     screen.drawImage(offscreen, 0, 0, sizeW, sizeH, null);
   }
 
