remove 2px border on bottom tabs, round both sides of them

This commit is contained in:
Ben Fry
2022-04-26 22:04:31 -04:00
parent 00b8c9e160
commit a4020d727b
2 changed files with 22 additions and 16 deletions
+12 -9
View File
@@ -54,8 +54,8 @@ public class EditorFooter extends Box {
static final int CURVE_RADIUS = Toolkit.zoom(6);
static final int TAB_TOP = Toolkit.zoom(2);
static final int TAB_BOTTOM = Toolkit.zoom(29);
static final int TAB_TOP = Toolkit.zoom(0);
static final int TAB_BOTTOM = Toolkit.zoom(27);
// amount of extra space between individual tabs
static final int TAB_BETWEEN = Toolkit.zoom(2);
// amount of margin on the left/right for the text on the tab
@@ -63,8 +63,8 @@ public class EditorFooter extends Box {
static final int ICON_WIDTH = Toolkit.zoom(16);
static final int ICON_HEIGHT = Toolkit.zoom(16);
static final int ICON_TOP = Toolkit.zoom(7);
static final int ICON_MARGIN = Toolkit.zoom(7);
static final int ICON_TOP = Toolkit.zoom(5);
static final int ICON_SIDE = Toolkit.zoom(7);
static final int ENABLED = 0;
static final int SELECTED = 1;
@@ -225,9 +225,9 @@ public class EditorFooter extends Box {
g.setColor(tabColor[SELECTED]);
// can't be done with lines, b/c retina leaves tiny hairlines
g.fillRect(0, 0, getWidth(), Toolkit.zoom(2));
//g.fillRect(0, 0, getWidth(), Toolkit.zoom(2));
g.drawImage(gradient, 0, Toolkit.zoom(2), getWidth(), getHeight(), this);
g.drawImage(gradient, 0, 0, getWidth(), getHeight(), this);
// reset all tab positions
for (Tab tab : tabs) {
@@ -366,6 +366,7 @@ public class EditorFooter extends Box {
return comp.isVisible();
}
/*
boolean isFirst() {
return tabs.get(0) == this;
}
@@ -373,11 +374,12 @@ public class EditorFooter extends Box {
boolean isLast() {
return tabs.get(tabs.size() - 1) == this;
}
*/
int getTextLeft() {
int links = left;
if (enabledIcon != null) {
links += ICON_WIDTH + ICON_MARGIN;
links += ICON_WIDTH + ICON_SIDE;
}
return links + ((right - links) - textWidth) / 2;
}
@@ -390,8 +392,9 @@ public class EditorFooter extends Box {
int state = isCurrent() ? SELECTED : ENABLED;
g2.setColor(tabColor[state]);
g2.fill(Toolkit.createRoundRect(left, TAB_TOP, right, TAB_BOTTOM, 0, 0,
isLast() ? CURVE_RADIUS : 0,
isFirst() ? CURVE_RADIUS : 0));
CURVE_RADIUS, CURVE_RADIUS));
// isLast() ? CURVE_RADIUS : 0,
// isFirst() ? CURVE_RADIUS : 0));
if (hasIcon()) {
Image icon = (isCurrent() || notification) ? selectedIcon : enabledIcon;
+10 -7
View File
@@ -7,10 +7,9 @@ X console.svg and error.svg already done
X if no matching theme selected, was highlighting column -1
X console scroll bar colors
X https://github.com/processing/processing4/issues/265
design/waiting
_ gradients
_ console scroll bar colors
X remove the 2 pixel line from the tab bar in the footer
X also round both edges of the editor footer tabs
X because the deselected tab no longer has an outline
contrib
X Double-clicking a .pde file also opens an untitled/empty sketch
@@ -164,13 +163,17 @@ _ orange exclamation looks like an error, not "update available"
_ add reinstall option?
design/waiting
_ gradients
_ console scroll bar colors
_ https://github.com/fathominfo/processing4-theme
design
_ add updateTheme() to contrib.ListPanel
_ right now pulling Theme.getColor() directly
_ but need to make sure repaint() is called anyway
_ remove the 2 pixel line from the tab bar in the footer
_ https://github.com/fathominfo/processing4-theme
_ make new gradients when selecting Theme Engine
_ menu background colors
_ important for prefs window background color too
_ errors table theme
_ contrib manager theme
_ identify coloring for icons