Skip to content

Commit aaaac8c

Browse files
committed
Show proper text in toolbar while hovering over the buttons
Signed-off-by: Umair Khan <[email protected]>
1 parent 4493285 commit aaaac8c

File tree

1 file changed

+34
-6
lines changed

1 file changed

+34
-6
lines changed

src/processing/mode/android/AndroidToolbar.java

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,16 @@
2020

2121
package processing.mode.android;
2222

23+
import java.awt.event.ActionEvent;
2324
import java.awt.event.InputEvent;
24-
import java.awt.event.MouseEvent;
25-
26-
import javax.swing.JPopupMenu;
25+
import java.util.ArrayList;
26+
import java.util.List;
2727

2828
import processing.app.Base;
2929
import processing.app.Editor;
30+
import processing.app.EditorButton;
3031
import processing.app.EditorToolbar;
32+
import processing.app.Language;
3133

3234

3335
@SuppressWarnings("serial")
@@ -55,7 +57,7 @@ public AndroidToolbar(Editor editor, Base base) {
5557
// }
5658
// }
5759

58-
60+
5961
static public String getTitle(int index, boolean shift) {
6062
switch (index) {
6163
case RUN: return !shift ? "Run on Device" : "Run in Emulator";
@@ -68,7 +70,7 @@ static public String getTitle(int index, boolean shift) {
6870
return null;
6971
}
7072

71-
73+
/*
7274
public void handlePressed(MouseEvent e, int sel) {
7375
boolean shift = e.isShiftDown();
7476
AndroidEditor aeditor = (AndroidEditor) editor;
@@ -113,7 +115,33 @@ public void handlePressed(MouseEvent e, int sel) {
113115
break;
114116
}
115117
}
116-
118+
*/
119+
120+
@Override
121+
public List<EditorButton> createButtons() {
122+
ArrayList<EditorButton> toReturn = new ArrayList<EditorButton>();
123+
runButton = new EditorButton(mode,
124+
"/lib/toolbar/run",
125+
"Run on device",
126+
"Run on emulator") {
127+
@Override
128+
public void actionPerformed(ActionEvent e) {
129+
handleRun(e.getModifiers());
130+
}
131+
};
132+
toReturn.add(runButton);
133+
134+
stopButton = new EditorButton(mode,
135+
"/lib/toolbar/stop",
136+
Language.text("toolbar.stop")) {
137+
@Override
138+
public void actionPerformed(ActionEvent e) {
139+
handleStop();
140+
}
141+
};
142+
toReturn.add(stopButton);
143+
return toReturn;
144+
}
117145

118146
@Override
119147
public void handleRun(int modifiers) {

0 commit comments

Comments
 (0)