diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index 297d419a3d..7672bf94f4 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -99,6 +99,11 @@ public class FileChooser extends FloatingDialog { updateFiles(true); }); + //Macs are confined to the Downloads/ directory + if(OS.isMac){ + up.setDisabled(true); + } + ImageButton back = new ImageButton("icon-arrow-left"); back.resizeImage(isize); @@ -169,7 +174,8 @@ public class FileChooser extends FloatingDialog { private void updateFiles(boolean push){ if(push) stack.push(directory); - navigation.setText(directory.toString()); + //if is mac, don't display extra info since you can only ever go to downloads + navigation.setText(OS.isMac ? directory.name() : directory.toString()); GlyphLayout layout = Pools.obtain(GlyphLayout.class); @@ -184,23 +190,25 @@ public class FileChooser extends FloatingDialog { Pools.free(layout); files.clearChildren(); + files.top().left(); FileHandle[] names = getFileNames(); - Image upimage = new Image("icon-folder-parent"); + //macs are confined to the Downloads/ directory + if(!OS.isMac) { + Image upimage = new Image("icon-folder-parent"); + TextButton upbutton = new TextButton(".." + directory.toString()); + upbutton.clicked(() -> { + directory = directory.parent(); + updateFiles(true); + }); - TextButton upbutton = new TextButton(".." + directory.toString()); - upbutton.clicked(()->{ - directory = directory.parent(); - updateFiles(true); - }); - - upbutton.left().add(upimage).padRight(4f).size(14*2); - upbutton.getCells().reverse(); - - files.top().left().add(upbutton).align(Align.topLeft).fillX().expandX().height(50).pad(2).colspan(2); - upbutton.getLabel().setAlignment(Align.left); + upbutton.left().add(upimage).padRight(4f).size(14 * 2); + upbutton.getLabel().setAlignment(Align.left); + upbutton.getCells().reverse(); - files.row(); + files.add(upbutton).align(Align.topLeft).fillX().expandX().height(50).pad(2).colspan(2); + files.row(); + } ButtonGroup group = new ButtonGroup(); group.setMinCheckCount(0);