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

Icon fixes

Browse Source
This commit is contained in:
Anuken
2019-06-20 22:20:25 -04:00
parent 43b5cb62bb
commit 387d9b39da
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -385,14 +385,14 @@ public class MapEditorDialog extends Dialog implements Disposable{
Consumer<EditorTool> addTool = tool -> { Consumer<EditorTool> addTool = tool -> {
Table[] lastTable = {null}; Table[] lastTable = {null};
ImageButton button = new ImageButton("icon-" + tool.name(), "clear-toggle"); ImageButton button = new ImageButton("icon-" + tool.name() + "-small", "clear-toggle");
button.clicked(() -> { button.clicked(() -> {
view.setTool(tool); view.setTool(tool);
if(lastTable[0] != null){ if(lastTable[0] != null){
lastTable[0].remove(); lastTable[0].remove();
} }
}); });
button.resizeImage(iconsize); button.resizeImage(iconsizesmall);
button.update(() -> button.setChecked(view.getTool() == tool)); button.update(() -> button.setChecked(view.getTool() == tool));
group.add(button); group.add(button);
@@ -462,16 +462,16 @@ public class MapEditorDialog extends Dialog implements Disposable{
tools.defaults().size(size, size); tools.defaults().size(size, size);
tools.addImageButton("icon-menu-large", "clear", iconsize, menu::show); tools.addImageButton("icon-menu-large-small", "clear", iconsizesmall, menu::show);
ImageButton grid = tools.addImageButton("icon-grid", "clear-toggle", iconsize, () -> view.setGrid(!view.isGrid())).get(); ImageButton grid = tools.addImageButton("icon-grid-small", "clear-toggle", iconsizesmall, () -> view.setGrid(!view.isGrid())).get();
addTool.accept(EditorTool.zoom); addTool.accept(EditorTool.zoom);
tools.row(); tools.row();
ImageButton undo = tools.addImageButton("icon-undo", "clear", iconsize, editor::undo).get(); ImageButton undo = tools.addImageButton("icon-undo-small", "clear", iconsizesmall, editor::undo).get();
ImageButton redo = tools.addImageButton("icon-redo", "clear", iconsize, editor::redo).get(); ImageButton redo = tools.addImageButton("icon-redo-small", "clear", iconsizesmall, editor::redo).get();
addTool.accept(EditorTool.pick); addTool.accept(EditorTool.pick);
@@ -493,7 +493,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
addTool.accept(EditorTool.fill); addTool.accept(EditorTool.fill);
addTool.accept(EditorTool.spray); addTool.accept(EditorTool.spray);
ImageButton rotate = tools.addImageButton("icon-arrow-16", "clear", iconsize, () -> editor.rotation = (editor.rotation + 1) % 4).get(); ImageButton rotate = tools.addImageButton("icon-arrow-16-small", "clear", iconsizesmall, () -> editor.rotation = (editor.rotation + 1) % 4).get();
rotate.getImage().update(() -> { rotate.getImage().update(() -> {
rotate.getImage().setRotation(editor.rotation * 90); rotate.getImage().setRotation(editor.rotation * 90);
rotate.getImage().setOrigin(Align.center); rotate.getImage().setOrigin(Align.center);

8
core/src/io/anuke/mindustry/editor/MapGenerateDialog.java
View File

@@ -123,24 +123,24 @@ public class MapGenerateDialog extends FloatingDialog{
t.table(b -> { t.table(b -> {
b.left(); b.left();
b.defaults().size(50f); b.defaults().size(50f);
b.addImageButton("icon-refresh", iconsize, () -> { b.addImageButton("icon-refresh-small", iconsizesmall, () -> {
filter.randomize(); filter.randomize();
update(); update();
}); });
b.addImageButton("icon-arrow-up", 10 * 2, () -> { b.addImageButton("icon-arrow-up-small", iconsizesmall, () -> {
int idx = filters.indexOf(filter); int idx = filters.indexOf(filter);
filters.swap(idx, Math.max(0, idx - 1)); filters.swap(idx, Math.max(0, idx - 1));
rebuildFilters(); rebuildFilters();
update(); update();
}); });
b.addImageButton("icon-arrow-down", 10 * 2, () -> { b.addImageButton("icon-arrow-down-small", iconsizesmall, () -> {
int idx = filters.indexOf(filter); int idx = filters.indexOf(filter);
filters.swap(idx, Math.min(filters.size - 1, idx + 1)); filters.swap(idx, Math.min(filters.size - 1, idx + 1));
rebuildFilters(); rebuildFilters();
update(); update();
}); });
b.addImageButton("icon-trash", iconsize, () -> { b.addImageButton("icon-trash-small", iconsizesmall, () -> {
filters.remove(filter); filters.remove(filter);
rebuildFilters(); rebuildFilters();
update(); update();