Test fixes

This commit is contained in:
Anuken
2020-08-13 20:28:36 -04:00
parent 1d95980066
commit 73dd7ba21a
7 changed files with 52 additions and 36 deletions

View File

@@ -221,41 +221,45 @@ public class MapGenerateDialog extends BaseDialog{
for(GenerateFilter filter : filters){
//main container
filterTable.table(Tex.button, c -> {
filterTable.table(Tex.pane, c -> {
c.margin(0);
//icons to perform actions
c.table(t -> {
t.top();
t.add(filter.name()).padTop(5).color(Pal.accent).growX().left();
c.table(Tex.whiteui, t -> {
t.setColor(Pal.gray);
t.row();
t.top().left();
t.add(filter.name()).left().padLeft(6);
t.table(b -> {
ImageButtonStyle style = Styles.cleari;
b.defaults().size(50f);
b.button(Icon.refresh, style, () -> {
filter.randomize();
update();
});
t.add().growX();
b.button(Icon.upOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.max(0, idx - 1));
rebuildFilters();
update();
});
b.button(Icon.downOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.min(filters.size - 1, idx + 1));
rebuildFilters();
update();
});
b.button(Icon.trash, style, () -> {
filters.remove(filter);
rebuildFilters();
update();
});
ImageButtonStyle style = Styles.geni;
t.defaults().size(42f);
t.button(Icon.refresh, style, () -> {
filter.randomize();
update();
});
}).fillX();
t.button(Icon.upOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.max(0, idx - 1));
rebuildFilters();
update();
});
t.button(Icon.downOpen, style, () -> {
int idx = filters.indexOf(filter);
filters.swap(idx, Math.min(filters.size - 1, idx + 1));
rebuildFilters();
update();
});
t.button(Icon.cancel, style, () -> {
filters.remove(filter);
rebuildFilters();
update();
});
}).growX();
c.row();
//all the options
c.table(f -> {
@@ -269,7 +273,7 @@ public class MapGenerateDialog extends BaseDialog{
}).growX().left();
f.row();
}
}).grow().left().pad(2).top();
}).grow().left().pad(6).top();
}).width(280f).pad(3).top().left().fillY();
if(++i % cols == 0){
filterTable.row();

View File

@@ -253,7 +253,7 @@ public class LCanvas extends Table{
t.add(st.name()).style(Styles.outlineLabel).color(color).padRight(8);
t.add().growX();
t.button(Icon.cancel, Styles.onlyi, () -> {
t.button(Icon.cancel, Styles.logici, () -> {
remove();
dragging = null;
statements.layout();

View File

@@ -26,7 +26,7 @@ public class Styles{
public static Drawable black, black9, black8, black6, black3, black5, none, flatDown, flatOver;
public static ButtonStyle defaultb, waveb;
public static TextButtonStyle defaultt, squaret, nodet, cleart, discordt, infot, clearPartialt, clearTogglet, clearToggleMenut, togglet, transt, fullTogglet, logict;
public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, onlyi, colori, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
public static ImageButtonStyle defaulti, nodei, righti, emptyi, emptytogglei, selecti, logici, geni, colori, cleari, clearFulli, clearPartiali, clearPartial2i, clearTogglei, clearTransi, clearToggleTransi, clearTogglePartiali;
public static ScrollPaneStyle defaultPane, horizontalPane, smallPane;
public static KeybindDialogStyle defaultKeybindDialog;
public static SliderStyle defaultSlider, vSlider;
@@ -197,10 +197,14 @@ public class Styles{
checked = buttonSelect;
up = none;
}};
onlyi = new ImageButtonStyle(){{
logici = new ImageButtonStyle(){{
//imageDownColor = Pal.accent;
imageUpColor = Color.black;
}};
geni = new ImageButtonStyle(){{
imageDownColor = Pal.accent;
imageUpColor = Color.white;
}};
colori = new ImageButtonStyle(){{
//imageDownColor = Pal.accent;
imageUpColor = Color.white;