eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

scrollbar working with theme colors

Browse Source
This commit is contained in:
Ben Fry
2022-01-12 17:06:39 -05:00
parent 712721f789
commit 47ec6c72cc
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/src/processing/app/syntax/PdeScrollBarUI.java
View File

@@ -23,6 +23,8 @@
package processing.app.syntax;
import processing.app.ui.Theme;
import javax.swing.*;
import javax.swing.plaf.basic.BasicScrollBarUI;
import java.awt.*;
@@ -62,7 +64,7 @@ public class PdeScrollBarUI extends BasicScrollBarUI {
@Override
protected void paintTrack(Graphics g, JComponent c, Rectangle r) {
g.setColor(Color.ORANGE);
g.setColor(Theme.getColor("editor.scrollbar.color"));
g.fillRect(0, 0, c.getWidth(), c.getHeight());
}
@@ -72,24 +74,24 @@ public class PdeScrollBarUI extends BasicScrollBarUI {
Graphics2D g2 = (Graphics2D) g.create();
// this can't really be necessary, can it?
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
Color color;
JScrollBar sb = (JScrollBar) c;
if (!sb.isEnabled()) {
return;
} else if (isDragging) {
color = Color.DARK_GRAY; // change color
} else if (isThumbRollover()) {
color = Color.LIGHT_GRAY; // change color
} else {
color = Color.GRAY; // change color
if (sb.isEnabled()) {
if (isDragging) {
color = Theme.getColor("editor.scrollbar.thumb.pressed.color");
} else if (isThumbRollover()) {
color = Theme.getColor("editor.scrollbar.thumb.rollover.color");
} else {
color = Theme.getColor("editor.scrollbar.thumb.enabled.color");
}
g2.setPaint(color);
int arc = Math.min(c.getWidth(), c.getHeight());
g2.fillRoundRect(r.x, r.y, r.width, r.height, arc, arc);
g2.setPaint(Color.WHITE);
g2.drawRoundRect(r.x, r.y, r.width, r.height, arc, arc);
g2.dispose();
}
g2.setPaint(color);
int shorter = Math.min(c.getWidth(), c.getHeight());
int arc = shorter;
g2.fillRoundRect(r.x, r.y, r.width, r.height, arc, arc);
g2.setPaint(Color.WHITE);
g2.drawRoundRect(r.x, r.y, r.width, r.height, arc, arc);
g2.dispose();
}

5
build/shared/lib/theme.txt
View File

@@ -126,8 +126,9 @@ editor.brackethighlight = true
editor.brackethighlight.color = #006699
# colors for the custom scroll bar
editor.scrollbar.thumb.color = #cccccc
editor.scrollbar.thumb.rollover.color = ##cccccc
editor.scrollbar.thumb.enabled.color = #cccccc
editor.scrollbar.thumb.rollover.color = #cccccc
editor.scrollbar.thumb.pressed.color = #cccccc
editor.scrollbar.color = #eeeeee