Skip to content

Add console hiding button #5115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benfry merged 1 commit into from
Jan 18, 2019
Merged

Add console hiding button #5115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions app/src/processing/app/ui/Editor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
113 changes: 85 additions & 28 deletions app/src/processing/app/ui/EditorStatus.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,20 +79,22 @@ 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;
static final int ROLLOVER_EMOJI = 3;

Font font;
FontMetrics metrics;
int ascent;

// used to draw the clipboard icon
static final int EMOJI_OFFSET = 27;
Font emojiFont;
int emojiLeft;
boolean emojiRollover;

Image offscreen;
int sizeW, sizeH;
boolean collapseState = false;

int response;

Expand All @@ -115,10 +117,10 @@ public void mouseEntered(MouseEvent e) {

@Override
public void mousePressed(MouseEvent e) {
if (urlRollover) {
if (rolloverState == ROLLOVER_URL) {
Platform.openURL(url);

} else if (emojiRollover) {
} else if (rolloverState == ROLLOVER_EMOJI) {
if (e.isShiftDown()) {
// open the text in a browser window as a search
final String fmt = Preferences.get("search.format");
Expand All @@ -131,17 +133,28 @@ public void mousePressed(MouseEvent e) {
System.out.println("Copied to the clipboard. " +
"Use shift-click to search the web instead.");
}

} 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) {
Expand All @@ -152,13 +165,26 @@ 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) {
setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR));
} else if (emojiRollover) {
switch (rolloverState) {
case ROLLOVER_EMOJI:
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();
}
Expand Down Expand Up @@ -282,8 +308,8 @@ public void stopIndeterminate() {
}


//public void paintComponent(Graphics screen) {
public void paint(Graphics screen) {
// public void paint(Graphics screen) {
Dimension size = getSize();
if ((size.width != sizeW) || (size.height != sizeH)) {
// component has been resized
Expand All @@ -308,31 +334,41 @@ public void paint(Graphics screen) {

g.drawImage(bgImage[mode], 0, 0, sizeW, sizeH, this);

g.setColor(fgColor[mode]);
// What's the mouse over?
if (sizeW - sizeH < mouseX && mouseX < sizeW) {
rolloverState = ROLLOVER_COLLAPSE;
} else if (message != null && !message.isEmpty()) {
if (sizeW - 2*sizeH < mouseX) {
rolloverState = ROLLOVER_EMOJI;
} else if (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;
}
} 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)(sizeH*1.2)) - w;
int y = sizeH / 3;
int h = sizeH / 3;
g.setColor(new Color(0x80000000, true));
g.drawRect(x, y, w, h);
for (int i = 0; i < 10; i++) {
Expand All @@ -341,20 +377,41 @@ public void paint(Graphics screen) {
}

} else if (!message.isEmpty()) {
g.setColor(Color.WHITE);
g.setFont(emojiFont);
// actual Clipboard character not available [fry 180326]
//g.drawString("\uD83D\uDCCB", sizeW - LEFT_MARGIN, (sizeH + ascent) / 2);
// other apps seem to use this one as a hack
emojiLeft = sizeW - Toolkit.zoom(EMOJI_OFFSET);
g.drawString("\u2398", emojiLeft, (sizeH + ascent) / 2);
emojiRollover = mouseX > emojiLeft - 4;
// other apps seem to use this one as a hack: ⎘
drawButton(g, "\u2398", 1, rolloverState == ROLLOVER_EMOJI);
g.setFont(font);
}

// draw collapse/expand button
drawButton(g, collapseState ? "▲" : "▼", 0, rolloverState == ROLLOVER_COLLAPSE);

screen.drawImage(offscreen, 0, 0, sizeW, sizeH, null);
}


private final Color whitishTint = new Color(0x40eeeeee, true);
/**
* @param pos A zero-based index with 0 on the right.
*/
private void drawButton(Graphics g, String symbol, int pos, boolean highlight) {
int left = sizeW - (pos + 1) * sizeH;
g.setColor(bgColor[mode]); // Overlap very long errors.
g.fillRect(left, 0, sizeH, sizeH);
if (highlight) {
g.setColor(whitishTint);
g.fillRect(left, 0, sizeH, sizeH);
g.setColor(urlColor);
} else {
g.setColor(fgColor[mode]);
}
g.drawString(symbol,
left + (sizeH - g.getFontMetrics().stringWidth(symbol))/2,
(sizeH + ascent) / 2);
}

public Dimension getPreferredSize() {
return getMinimumSize();
}
Expand Down