Skip to content

Commit 2ef0f35

Browse files
committed
Button pairing
1 parent ea85920 commit 2ef0f35

11 files changed

Lines changed: 33 additions & 12 deletions

assets/bundles/bundle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tu-unit-menu.spawn = Spawn Unit
2525
tu-unit-menu.spawnplural = Spawn Units
2626
tu-unit-menu.transform = Transform
2727
tu-unit-menu.canttransform = [red]Cannot transform into selected unit here.
28-
tu-unit-menu.despawns = Transformation Despawns
28+
tu-unit-menu.despawns = Despawns
2929

3030
tu-menu.selection = [accent]Current selection:
3131

301 Bytes
Loading
310 Bytes
Loading
307 Bytes
Loading
300 Bytes
Loading
309 Bytes
Loading

src/testing/buttons/Folding.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public static void folding(Table t){
1414
}
1515

1616
public static void add(Table[] tables){
17-
tables[0].table(TUVars.TCOffset == 0 ? Tex.buttonEdge3 : TUStyles.buttonEdgeCap, Folding::folding)
17+
tables[0].table(TUVars.TCOffset == 0 ? Tex.buttonEdge3 : TUStyles.buttonRight, Folding::folding)
1818
.padBottom(TUVars.TCOffset).padLeft(Vars.mobile ? 164 : 479);
19-
tables[1].table(TUVars.TCOffset == 0 || Vars.mobile ? Tex.buttonEdge3 : TUStyles.buttonEdgeCap, Folding::folding)
19+
tables[1].table(TUVars.TCOffset == 0 || Vars.mobile ? Tex.buttonEdge3 : TUStyles.buttonRight, Folding::folding)
2020
.padBottom(TUVars.TCOffset + (Vars.mobile ? TUVars.buttonHeight : 0)).padLeft(Vars.mobile ? 144 : 220);
2121
}
2222
}

src/testing/buttons/dialogs/StatusDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ void rebuild(){
123123
all.row();
124124

125125
all.table(null, b -> {
126-
ImageButton ab = b.button(Icon.add, 32, this::apply).get();
126+
ImageButton ab = b.button(Icon.add, TUStyles.lefti, 32, this::apply).get();
127127
ab.label(() -> "@tu-status-menu.apply").padLeft(6).growX();
128128

129-
ImageButton pb = b.button(Icon.refresh, TUStyles.togglei, 32, () -> perma = !perma).padLeft(6).get();
129+
ImageButton pb = b.button(Icon.refresh, TUStyles.toggleRighti, 32, () -> perma = !perma).get();
130130
Label pl = pb.label(() -> "@tu-status-menu.perma").padLeft(6).growX().get();
131131
pb.setDisabled(() -> status.permanent);
132132
pb.update(() -> {

src/testing/buttons/dialogs/UnitDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void rebuild(){
186186
all.row();
187187

188188
all.table(b -> {
189-
ImageButton ib = b.button(Icon.units, 32, () -> {
189+
ImageButton ib = b.button(Icon.units, TUStyles.lefti, 32, () -> {
190190
if(spawnUnit.constructor.get().canPass(player.tileX(), player.tileY())){
191191
//For some reason spider units also return false even though they can stand on blocks.
192192
transform();
@@ -197,7 +197,7 @@ void rebuild(){
197197
ib.setDisabled(() -> player.unit().type == UnitTypes.block);
198198
ib.label(() -> "@tu-unit-menu.transform").padLeft(6).growX();
199199

200-
ImageButton db = b.button(TUIcons.shard, TUStyles.togglei, 32, () -> despawns = !despawns).padLeft(6).growX().get();
200+
ImageButton db = b.button(TUIcons.shard, TUStyles.toggleRighti, 32, () -> despawns = !despawns).growX().get();
201201
db.update(() -> db.setChecked(despawns));
202202
db.label(() -> "@tu-unit-menu.despawns").padLeft(6).growX();
203203
}).padTop(6);

0 commit comments

Comments
 (0)