From 2f726cf7f2425e04a3064d47dabafdac18a91217 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 6 Dec 2018 19:57:26 -0500 Subject: [PATCH 1/2] (2) --- core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 2c0f16d28e..f7c9944b67 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -184,7 +184,7 @@ public class PlacementFragment extends Fragment{ categories.addImageButton("icon-" + cat.name(), "clear-toggle", 16*2, () -> { currentCategory = cat; rebuildCategory.run(); - }).group(group).update(i -> i.setChecked(group.getChecked() == i)); + }).group(group).update(i -> i.setChecked(currentCategory == cat)); if(cat.ordinal() %2 == 1) categories.row(); } From 81c24b3de14365eb43c38964e9c221965e3e15ae Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 6 Dec 2018 22:27:39 -0500 Subject: [PATCH 2/2] Fixed file chooser style / Fixed sector save invisibility --- core/src/io/anuke/mindustry/game/Saves.java | 1 + core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java | 4 ++-- core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/io/anuke/mindustry/game/Saves.java b/core/src/io/anuke/mindustry/game/Saves.java index 3947d578cd..5d45bfd52f 100644 --- a/core/src/io/anuke/mindustry/game/Saves.java +++ b/core/src/io/anuke/mindustry/game/Saves.java @@ -127,6 +127,7 @@ public class Saves{ saveMap.put(slot.index, slot); slot.meta = SaveIO.getData(slot.index); current = slot; + slot.meta.sector = invalidSector; saveSlots(); return slot; } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index fd94891b8c..b608f3527c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -198,7 +198,7 @@ public class FileChooser extends FloatingDialog{ //macs are confined to the Downloads/ directory if(!OS.isMac){ Image upimage = new Image("icon-folder-parent"); - TextButton upbutton = new TextButton(".." + directory.toString(), "clear"); + TextButton upbutton = new TextButton(".." + directory.toString(), "clear-toggle"); upbutton.clicked(() -> { directory = directory.parent(); updateFiles(true); @@ -220,7 +220,7 @@ public class FileChooser extends FloatingDialog{ String filename = file.name(); - TextButton button = new TextButton(shorten(filename), "clear"); + TextButton button = new TextButton(shorten(filename), "clear-toggle"); group.add(button); button.clicked(() -> { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java index facfcab706..d402ed9eeb 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/LoadDialog.java @@ -161,6 +161,7 @@ public class LoadDialog extends FloatingDialog{ control.saves.importSave(file); setup(); }catch(IOException e){ + e.printStackTrace(); ui.showError(Bundles.format("text.save.import.fail", Strings.parseException(e, false))); } }else{