eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix up theme handling for the EditorFooter and its indicators

Browse Source
This commit is contained in:
Ben Fry
2022-01-13 16:04:14 -05:00
parent 1098550587
commit f11b210ffb
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/processing/app/ui/EditorFooter.java
View File

@@ -72,11 +72,6 @@ public class EditorFooter extends Box {
Color[] textColor = new Color[2];
Color[] tabColor = new Color[2];
Color updatesTextColor;
Color indicatorFieldColor;
Color indicatorTextColor;
int updateLeft;
Editor editor;
List<Tab> tabs = new ArrayList<>();
@@ -102,14 +97,14 @@ public class EditorFooter extends Box {
super(BoxLayout.Y_AXIS);
this.editor = eddie;
updateTheme();
cardLayout = new CardLayout();
cardPanel = new JPanel(cardLayout);
add(cardPanel);
controller = new Controller();
add(controller);
updateTheme();
}
@@ -170,11 +165,6 @@ public class EditorFooter extends Box {
tabColor[SELECTED] = Theme.getColor("footer.tab.selected.color");
tabColor[ENABLED] = Theme.getColor("footer.tab.enabled.color");
updatesTextColor = Theme.getColor("footer.updates.text.color");
indicatorFieldColor = Theme.getColor("footer.updates.indicator.field.color");
indicatorTextColor = Theme.getColor("footer.updates.indicator.text.color");
controller.repaint();
gradient = Theme.makeGradient("footer", 400, HIGH);
// Set the default background color in case the window size reported
// incorrectly by the OS, or we miss an update event of some kind
@@ -185,6 +175,9 @@ public class EditorFooter extends Box {
for (Tab tab : tabs) {
tab.updateTheme();
}
// replace colors for the "updates" indicator
controller.updateTheme();
}
@@ -192,6 +185,11 @@ public class EditorFooter extends Box {
class Controller extends JComponent {
Color updatesTextColor;
Color indicatorFieldColor;
Color indicatorTextColor;
int updateLeft;
Controller() {
addMouseListener(new MouseAdapter() {
@@ -211,6 +209,13 @@ public class EditorFooter extends Box {
});
}
void updateTheme() {
updatesTextColor = Theme.getColor("footer.updates.text.color");
indicatorFieldColor = Theme.getColor("footer.updates.indicator.field.color");
indicatorTextColor = Theme.getColor("footer.updates.indicator.text.color");
repaint();
}
public void paintComponent(Graphics screen) {
if (screen == null) return;
Sketch sketch = editor.getSketch();
@@ -364,9 +369,6 @@ public class EditorFooter extends Box {
protected void updateTheme() {
if (icon != null) {
//Mode mode = editor.getMode();
//enabledIcon = mode.loadImageX(icon + "-enabled");
//selectedIcon = mode.loadImageX(icon + "-selected");
enabledIcon = renderImage("enabled");
selectedIcon = renderImage("selected");
if (selectedIcon == null) {