Skip to content

Commit 273b84e

Browse files
benfrybenfry
committed
toolbar in the tray working
1 parent 2306444 commit 273b84e

File tree

9 files changed

+18
-10
lines changed

9 files changed

+18
-10
lines changed

‎app/src/processing/app/EditorButton.java‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,11 @@ public EditorButton(Mode mode, String name, String title, String titleShift) {
6262
this.titleShift = titleShift;
6363

6464
final int res = Toolkit.highResDisplay() ? 2 : 1;
65-
66-
disabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
65+
disabledImage = mode.loadImage(name + "-disabled-" + res + "x.png");
6766
enabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
68-
selectedImage = mode.loadImage(name + "-enabled-" + res + "x.png");
69-
pressedImage = mode.loadImage(name + "-enabled-" + res + "x.png");
70-
rolloverImage = mode.loadImage(name + "-enabled-" + res + "x.png");
67+
selectedImage = mode.loadImage(name + "-selected-" + res + "x.png");
68+
pressedImage = mode.loadImage(name + "-pressed-" + res + "x.png");
69+
rolloverImage = mode.loadImage(name + "-rollover-" + res + "x.png");
7170

7271
if (disabledImage == null) {
7372
disabledImage = enabledImage;
@@ -81,6 +80,8 @@ public EditorButton(Mode mode, String name, String title, String titleShift) {
8180
if (rolloverImage == null) {
8281
rolloverImage = enabledImage; // could be pressed image
8382
}
83+
addMouseListener(this);
84+
addMouseMotionListener(this);
8485
}
8586

8687

‎app/src/processing/app/Mode.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,8 +1184,10 @@ public void run() {
11841184
public ImageIcon loadIcon(String filename) {
11851185
File file = new File(folder, filename);
11861186
if (!file.exists()) {
1187+
// EditorConsole.systemErr.println("file does not exist: " + file.getAbsolutePath());
11871188
return null;
11881189
}
1190+
// EditorConsole.systemErr.println("found: " + file.getAbsolutePath());
11891191
return new ImageIcon(file.getAbsolutePath());
11901192
}
11911193

‎java/src/processing/mode/java/DebugTray.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import java.util.logging.Logger;
3434

3535
import javax.swing.*;
36+
import javax.swing.border.EmptyBorder;
3637
import javax.swing.event.TreeExpansionEvent;
3738
import javax.swing.event.TreeExpansionListener;
3839
import javax.swing.table.TableColumn;
@@ -124,7 +125,7 @@ Container createToolbar() {
124125
Box box = Box.createHorizontalBox();
125126

126127
continueButton =
127-
new EditorButton(mode, "debug-continue",
128+
new EditorButton(mode, "theme/debug/continue",
128129
Language.text("toolbar.debug.continue")) {
129130
@Override
130131
public void actionPerformed(ActionEvent e) {
@@ -136,7 +137,7 @@ public void actionPerformed(ActionEvent e) {
136137
box.add(Box.createHorizontalStrut(GAP));
137138

138139
stepButton =
139-
new EditorButton(mode, "debug-step",
140+
new EditorButton(mode, "theme/debug/step",
140141
Language.text("toolbar.debug.step"),
141142
Language.text("toolbar.debug.step_into")) {
142143
@Override
@@ -154,23 +155,27 @@ public void actionPerformed(ActionEvent e) {
154155
box.add(Box.createHorizontalStrut(GAP));
155156

156157
breakpointButton =
157-
new EditorButton(mode, "debug-breakpoint",
158+
new EditorButton(mode, "theme/debug/breakpoint",
158159
Language.text("toolbar.debug.toggle_breakpoints")) {
159160
@Override
160161
public void actionPerformed(ActionEvent e) {
161162
Logger.getLogger(DebugTray.class.getName()).log(Level.INFO, "Invoked 'Toggle Breakpoint' toolbar button");
162163
editor.debugger.toggleBreakpoint();
163164
}
164165
};
165-
add(breakpointButton);
166+
box.add(breakpointButton);
166167
box.add(Box.createHorizontalStrut(GAP));
167168

168-
JLabel label = new JLabel();
169+
JLabel label = new JLabel("testing");
169170
box.add(label);
170171
continueButton.setRolloverLabel(label);
171172
stepButton.setRolloverLabel(label);
172173
breakpointButton.setRolloverLabel(label);
173174

175+
// the rest is all gaps
176+
box.add(Box.createHorizontalGlue());
177+
box.setBorder(new EmptyBorder(GAP, GAP, GAP, GAP));
178+
174179
return box;
175180
}
176181

java/theme/debug/breakpoint-1x.png renamed to java/theme/debug/breakpoint-enabled-1x.png

File renamed without changes.

java/theme/debug/breakpoint-2x.png renamed to java/theme/debug/breakpoint-enabled-2x.png

File renamed without changes.

java/theme/debug/continue-1x.png renamed to java/theme/debug/continue-enabled-1x.png

File renamed without changes.

java/theme/debug/continue-2x.png renamed to java/theme/debug/continue-enabled-2x.png

File renamed without changes.

java/theme/debug/step-1x.png renamed to java/theme/debug/step-enabled-1x.png

File renamed without changes.

java/theme/debug/step-2x.png renamed to java/theme/debug/step-enabled-2x.png

File renamed without changes.

0 commit comments

Comments
 (0)