Skip to content

Commit 6c91f86

Browse files
benfrybenfry
committed
line number tweaks, button tweaks, debugger startup, fixes processing#3096 
1 parent 3146081 commit 6c91f86

File tree

8 files changed

+197
-188
lines changed

8 files changed

+197
-188
lines changed

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

Lines changed: 55 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,50 +26,50 @@
2626
import javax.swing.*;
2727

2828

29-
abstract public class EditorButton extends JComponent
29+
abstract public class EditorButton extends JComponent
3030
implements MouseListener, MouseMotionListener, ActionListener {
3131
static public final int DIM = 35;
3232

33-
/** Button's description. */
33+
/** Button's description. */
3434
protected String title;
35-
/** Description of alternate behavior when shift is down. */
35+
/** Description of alternate behavior when shift is down. */
3636
protected String titleShift;
3737

3838
protected boolean pressed;
3939
protected boolean selected;
4040
protected boolean rollover;
4141
protected JLabel rolloverLabel;
4242
protected boolean shift;
43-
43+
4444
protected Image enabledImage;
4545
protected Image disabledImage;
4646
protected Image selectedImage;
4747
protected Image rolloverImage;
4848
protected Image pressedImage;
49-
49+
5050
protected Image gradient;
51-
51+
5252
protected Mode mode;
53-
54-
53+
54+
5555
public EditorButton(Mode mode, String name, String title) {
5656
this(mode, name, title, title);
5757
}
58-
58+
5959

6060
public EditorButton(Mode mode, String name, String title, String titleShift) {
6161
this.mode = mode;
6262
this.title = title;
6363
this.titleShift = titleShift;
64-
64+
6565
final int res = Toolkit.highResDisplay() ? 2 : 1;
6666
disabledImage = mode.loadImage(name + "-disabled-" + res + "x.png");
6767
enabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
6868
selectedImage = mode.loadImage(name + "-selected-" + res + "x.png");
6969
pressedImage = mode.loadImage(name + "-pressed-" + res + "x.png");
7070
rolloverImage = mode.loadImage(name + "-rollover-" + res + "x.png");
71-
72-
if (disabledImage == null) {
71+
72+
if (disabledImage == null) {
7373
disabledImage = enabledImage;
7474
}
7575
if (selectedImage == null) {
@@ -84,8 +84,8 @@ public EditorButton(Mode mode, String name, String title, String titleShift) {
8484
addMouseListener(this);
8585
addMouseMotionListener(this);
8686
}
87-
88-
87+
88+
8989
@Override
9090
public void paintComponent(Graphics g) {
9191
Image image = enabledImage;
@@ -103,39 +103,39 @@ public void paintComponent(Graphics g) {
103103
}
104104
g.drawImage(image, 0, 0, DIM, DIM, this);
105105
}
106-
107-
106+
107+
108108
// public String toString() {
109109
// switch (this) {
110110
// case DISABLED: return "disabled";
111111
// case ENABLED: return "enabled";
112112
// case SELECTED: return "selected";
113113
// case ROLLOVER: return "rollover";
114114
// case PRESSED: return "pressed";
115-
//
115+
//
116116
//// for (State bs : State.values()) {
117117
//// Image image = mode.loadImage(bs.getFilename(name));
118118
//// if (image != null) {
119119
//// imageMap.put(bs, image);
120120
//// }
121121
//// }
122-
////
122+
////
123123
//// enabled = true;
124124
//// //updateState();
125125
//// setState(State.ENABLED);
126-
// }
127-
128-
126+
// }
127+
128+
129129
public void setReverse() {
130130
gradient = mode.getGradient("reversed", DIM, DIM);
131131
}
132-
133-
132+
133+
134134
// public void setGradient(Image gradient) {
135135
// this.gradient = gradient;
136136
// }
137-
138-
137+
138+
139139
public void setRolloverLabel(JLabel label) {
140140
rolloverLabel = label;
141141
}
@@ -145,12 +145,12 @@ public void setRolloverLabel(JLabel label) {
145145
public void mouseClicked(MouseEvent e) {
146146
if (isEnabled()) {
147147
shift = e.isShiftDown();
148-
actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
148+
actionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
149149
null, e.getModifiers()));
150150
}
151151
}
152-
153-
152+
153+
154154
public boolean isShiftDown() {
155155
return shift;
156156
}
@@ -166,8 +166,8 @@ public void mousePressed(MouseEvent e) {
166166
public void mouseReleased(MouseEvent e) {
167167
setPressed(false);
168168
}
169-
170-
169+
170+
171171
public void setPressed(boolean pressed) {
172172
if (isEnabled()) {
173173
this.pressed = pressed;
@@ -176,6 +176,11 @@ public void setPressed(boolean pressed) {
176176
}
177177

178178

179+
public void setSelected(boolean selected) {
180+
this.selected = selected;
181+
}
182+
183+
179184
@Override
180185
public void mouseEntered(MouseEvent e) {
181186
rollover = true;
@@ -205,41 +210,41 @@ public void mouseMoved(MouseEvent e) { }
205210

206211

207212
abstract public void actionPerformed(ActionEvent e);
208-
213+
209214
// @Override
210-
// public void actionPerformed(ActionEvent e) {
215+
// public void actionPerformed(ActionEvent e) {
211216
// // To be overridden by all subclasses
212217
// }
213-
214-
218+
219+
215220
@Override
216221
public Dimension getPreferredSize() {
217222
return new Dimension(DIM, DIM);
218223
}
219-
220-
224+
225+
221226
@Override
222227
public Dimension getMinimumSize() {
223228
return getPreferredSize();
224229
}
225-
226-
230+
231+
227232
@Override
228233
public Dimension getMaximumSize() {
229234
return getPreferredSize();
230235
}
231-
232-
236+
237+
233238
// public Image getImage() {
234239
// return imageMap.get(state);
235240
// }
236241
//
237-
//
242+
//
238243
//// protected void updateState() {
239244
//// state = ButtonState.ENABLED;
240245
//// }
241-
//
242-
//
246+
//
247+
//
243248
// public void setEnabled(boolean enabled) {
244249
// this.enabled = enabled;
245250
// if (enabled) {
@@ -252,25 +257,25 @@ public Dimension getMaximumSize() {
252257
// }
253258
// }
254259
// }
255-
//
256-
//
260+
//
261+
//
257262
// public void setState(State state) {
258263
// this.state = state;
259264
// }
260265

261266

262267
// public enum State {
263268
// DISABLED, ENABLED, SELECTED, ROLLOVER, PRESSED;
264-
//
265-
// /**
266-
// * @param name the root name
269+
//
270+
// /**
271+
// * @param name the root name
267272
// * @return
268273
// */
269274
// public String getFilename(String name) {
270275
// final int res = Toolkit.highResDisplay() ? 2 : 1;
271-
// return name + "-" + toString() + "-" + res + "x.png";
276+
// return name + "-" + toString() + "-" + res + "x.png";
272277
// }
273-
//
278+
//
274279
// public String toString() {
275280
// switch (this) {
276281
// case DISABLED: return "disabled";

0 commit comments

Comments
 (0)