Skip to content

Commit d9ff302

Browse files
committed
make editor scroll bar into a generic class for themes
1 parent a4c1d94 commit d9ff302

File tree

2 files changed

+27
-2
lines changed

2 files changed

+27
-2
lines changed

app/src/processing/app/syntax/PdeTextArea.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828

2929
import processing.app.ui.Editor;
3030
import processing.app.ui.Theme;
31+
import processing.app.ui.ThemeScrollBarUI;
3132

3233

3334
/**
@@ -67,6 +68,16 @@ public PdeTextArea(TextAreaDefaults defaults, InputHandler inputHandler,
6768
}
6869

6970

71+
static class PdeScrollBarUI extends ThemeScrollBarUI {
72+
PdeScrollBarUI() {
73+
super("editor.scrollbar.color",
74+
"editor.scrollbar.thumb.pressed.color",
75+
"editor.scrollbar.thumb.rollover.color",
76+
"editor.scrollbar.thumb.enabled.color");
77+
}
78+
}
79+
80+
7081
@Override
7182
protected TextAreaPainter createPainter(final TextAreaDefaults defaults) {
7283
return new PdeTextAreaPainter(this, defaults);

app/src/processing/app/syntax/PdeScrollBarUI.java renamed to app/src/processing/app/ui/ThemeScrollBarUI.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
2222
*/
2323

24-
package processing.app.syntax;
24+
package processing.app.ui;
2525

2626
import processing.app.ui.Theme;
2727

@@ -34,15 +34,29 @@
3434
* Custom scroll bar style for the editor.
3535
* Originally based on https://stackoverflow.com/a/53662678
3636
*/
37-
public class PdeScrollBarUI extends BasicScrollBarUI {
37+
public class ThemeScrollBarUI extends BasicScrollBarUI {
3838
private final Dimension none = new Dimension();
3939

40+
private String backgroundAttr;
41+
private String pressedAttr;
42+
private String rolloverAttr;
43+
private String enabledAttr;
44+
4045
private Color backgroundColor;
4146
private Color pressedColor;
4247
private Color rolloverColor;
4348
private Color enabledColor;
4449

4550

51+
public ThemeScrollBarUI(String backgroundAttr, String pressedAttr,
52+
String rolloverAttr, String enabledAttr) {
53+
this.backgroundAttr = backgroundAttr;
54+
this.pressedAttr = pressedAttr;
55+
this.rolloverAttr = rolloverAttr;
56+
this.enabledAttr = enabledAttr;
57+
}
58+
59+
4660
public void updateTheme() {
4761
backgroundColor = Theme.getColor("editor.scrollbar.color");
4862
pressedColor = Theme.getColor("editor.scrollbar.thumb.pressed.color");

0 commit comments

Comments
 (0)