Skip to content

Commit cfdf88e

Browse files
committed
Proper disabled texture for overwritten sounds
1 parent d6c7712 commit cfdf88e

4 files changed

Lines changed: 16 additions & 11 deletions

File tree

164 Bytes
Loading

src/testing/dialogs/sound/MusicsTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void vanillaMusicList(Table t, Seq<Music> musics){
137137
TextButton mb = t.button(getName(m), () -> {
138138
selectedMusic = m;
139139
}).uniformX().grow().checked(b -> selectedMusic == m).get();
140-
mb.getStyle().checked = Tex.flatDownBase;
140+
mb.setStyle(TUStyles.toggleCentert);
141141

142142
if(overrides.containsKey(m)){
143143
mb.setDisabled(true);
@@ -167,7 +167,7 @@ public void modMusicList(Table t, Seq<Music> musics){
167167
t.button(getName(m), () -> {
168168
selectedMusic = m;
169169
}).uniformX().grow().checked(b -> selectedMusic == m)
170-
.get().getStyle().checked = Tex.flatDownBase;
170+
.get().setStyle(TUStyles.toggleCentert);
171171

172172
if((++count) % cols == 0){
173173
t.row();

src/testing/dialogs/sound/SoundsTable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public void vanillaSoundList(Table t, Seq<Sound> sounds){
198198
stopSounds();
199199
sound = s;
200200
}).uniformX().grow().checked(b -> sound == s).get();
201-
sb.getStyle().checked = Tex.flatDownBase;
201+
sb.setStyle(TUStyles.toggleCentert);
202202

203203
if(overrides.containsKey(s)){
204204
sb.setDisabled(true);
@@ -229,7 +229,7 @@ public void modSoundList(Table t, Seq<Sound> sounds){
229229
stopSounds();
230230
sound = s;
231231
}).uniformX().grow().checked(b -> sound == s)
232-
.get().getStyle().checked = Tex.flatDownBase;
232+
.get().setStyle(TUStyles.toggleCentert);
233233

234234
if((++count) % cols == 0){
235235
t.row();

src/testing/ui/TUStyles.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@
1313
public class TUStyles{
1414
public static Drawable
1515
buttonLeft, buttonLeftDown, buttonLeftOver,
16-
buttonCenter, buttonCenterDown, buttonCenterOver,
16+
buttonCenter, buttonCenterDown, buttonCenterOver, buttonCenterDisabled,
1717
buttonRight, buttonRightOver, buttonRightDown,
1818
paneBottom;
1919
public static ButtonStyle right;
20-
public static TextButtonStyle round;
20+
public static TextButtonStyle round, toggleCentert;
2121
public static ImageButtonStyle
2222
tuImageStyle,
2323
togglei,
2424
lefti, toggleLefti,
2525
righti, toggleRighti,
26-
centeri, toggleCenteri;
26+
centeri;
2727

2828
public static void init(){
2929
buttonLeft = atlas.getDrawable("test-utils-button-left");
@@ -32,6 +32,7 @@ public static void init(){
3232
buttonCenter = atlas.getDrawable("test-utils-button-center");
3333
buttonCenterDown = atlas.getDrawable("test-utils-button-center-down");
3434
buttonCenterOver = atlas.getDrawable("test-utils-button-center-over");
35+
buttonCenterDisabled = atlas.getDrawable("test-utils-button-center-disabled");
3536
buttonRight = atlas.getDrawable("test-utils-button-right");
3637
buttonRightDown = atlas.getDrawable("test-utils-button-right-down");
3738
buttonRightOver = atlas.getDrawable("test-utils-button-right-over");
@@ -47,6 +48,14 @@ public static void init(){
4748
checked = up;
4849
}};
4950

51+
toggleCentert = new TextButtonStyle(Styles.defaultt){{
52+
up = buttonCenter;
53+
down = buttonCenterDown;
54+
over = buttonCenterOver;
55+
checked = buttonCenterOver;
56+
disabled = buttonCenterDisabled;
57+
}};
58+
5059
tuImageStyle = new ImageButtonStyle(Styles.logici){{
5160
down = Styles.flatDown;
5261
over = Styles.flatOver;
@@ -83,9 +92,5 @@ public static void init(){
8392
down = buttonCenterDown;
8493
over = buttonCenterOver;
8594
}};
86-
87-
toggleCenteri = new ImageButtonStyle(centeri){{
88-
checked = buttonCenterOver;
89-
}};
9095
}
9196
}

0 commit comments

Comments
 (0)