Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Overlapping icon button casings will bother me no more

Browse Source
This commit is contained in:
Anuken
2018-12-13 16:46:45 -05:00
parent 8aa8de570f
commit aeb28f67e4
2 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/editor/MapEditorDialog.java
View File

@@ -278,15 +278,12 @@ public class MapEditorDialog extends Dialog implements Disposable{
}).left().margin(0).get(); }).left().margin(0).get();
button.clearChildren(); button.clearChildren();
button.table("button", t -> { button.addImage(iconname).size(16 * 3).padLeft(10);
t.addImage(iconname).size(16 * 3);
t.update(() -> t.background(button.getClickListener().isPressed() ? "button-down" : button.getClickListener().isOver() ? "button-over" : "button"));
}).size(h);
button.table(t -> { button.table(t -> {
t.add(name).growX().wrap(); t.add(name).growX().wrap();
t.row(); t.row();
t.add(description).color(Color.GRAY).growX().wrap(); t.add(description).color(Color.GRAY).growX().wrap();
}).growX().pad(10f); }).growX().pad(10f).padLeft(5);
button.row(); button.row();

8
core/src/io/anuke/mindustry/ui/MenuButton.java
View File

@@ -12,21 +12,15 @@ public class MenuButton extends TextButton{
public MenuButton(String icon, String text, String description, Runnable clicked){ public MenuButton(String icon, String text, String description, Runnable clicked){
super("default"); super("default");
float s = 66f;
clicked(clicked); clicked(clicked);
clearChildren(); clearChildren();
margin(0); margin(0);
table(t -> { table(t -> {
t.addImage(icon).size(14 * 3); t.addImage(icon).size(14 * 3).padLeft(6);
t.update(() -> t.setBackground(getClickListener().isVisualPressed() ? "button-down" : getClickListener().isOver() ? "button-over" : "button"));
}).size(s - 5, s);
table(t -> {
t.add(text).wrap().growX().get().setAlignment(Align.center, Align.left); t.add(text).wrap().growX().get().setAlignment(Align.center, Align.left);
if(description != null){ if(description != null){
t.row(); t.row();