diff --git a/core/src/mindustry/ui/SearchBar.java b/core/src/mindustry/ui/SearchBar.java index 57d1977a9d..8929f45266 100644 --- a/core/src/mindustry/ui/SearchBar.java +++ b/core/src/mindustry/ui/SearchBar.java @@ -40,7 +40,7 @@ public class SearchBar{ parent.pane(table -> { pane[0] = table; rebuild.get(""); - }); + }).get().setScrollingDisabled(true, false); return pane[0]; } @@ -54,9 +54,6 @@ public class SearchBar{ /** Match a list item with the search query, case insensitive */ public static boolean matches(String query, String name){ - if(name == null || name.isEmpty()){ - return false; - } - return name.toLowerCase().contains(query); + return name != null && !name.isEmpty() && name.toLowerCase().contains(query); } } diff --git a/core/src/mindustry/ui/dialogs/ModsDialog.java b/core/src/mindustry/ui/dialogs/ModsDialog.java index de974ce8d8..593c714674 100644 --- a/core/src/mindustry/ui/dialogs/ModsDialog.java +++ b/core/src/mindustry/ui/dialogs/ModsDialog.java @@ -147,12 +147,11 @@ public class ModsDialog extends BaseDialog{ } void setup(){ - boolean squish = Core.graphics.isPortrait(); float h = 110f; - float w = squish ? 410f : 524f; + float w = Math.min(Core.graphics.getWidth() / 1.1f, 520f); //squish ? 410f : 524f; cont.clear(); - cont.defaults().width(squish ? 480 : 560f).pad(4); + cont.defaults().width(Math.min(Core.graphics.getWidth() / 1.2f, 520f)).pad(4); cont.add("@mod.reloadrequired").visible(mods::requiresReload).center().get().setAlignment(Align.center); cont.row();