From 567b5156117a106ca8b8674dc3c271a710ff4e3a Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 29 Sep 2024 12:35:24 -0400 Subject: [PATCH] Wider objective editing dialog --- core/src/mindustry/editor/MapObjectivesCanvas.java | 2 +- core/src/mindustry/editor/MapObjectivesDialog.java | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/editor/MapObjectivesCanvas.java b/core/src/mindustry/editor/MapObjectivesCanvas.java index bd84a22ff7..0cde471b89 100644 --- a/core/src/mindustry/editor/MapObjectivesCanvas.java +++ b/core/src/mindustry/editor/MapObjectivesCanvas.java @@ -368,7 +368,7 @@ public class MapObjectivesCanvas extends WidgetGroup{ () -> obj, res -> {} ); - }).width(400f).fillY()).grow(); + }).width(Math.min(Core.graphics.getWidth() * 0.95f / Scl.scl(1f) - Scl.scl(20f), 700f)).fillY()).grow(); dialog.addCloseButton(); dialog.show(); diff --git a/core/src/mindustry/editor/MapObjectivesDialog.java b/core/src/mindustry/editor/MapObjectivesDialog.java index ecdc53e01e..06bcd077e9 100644 --- a/core/src/mindustry/editor/MapObjectivesDialog.java +++ b/core/src/mindustry/editor/MapObjectivesDialog.java @@ -44,7 +44,7 @@ public class MapObjectivesDialog extends BaseDialog{ name(cont, name, remover, indexer); if(field != null && field.isAnnotationPresent(Multiline.class)){ - cont.area(get.get(), set).height(85f).growX(); + cont.area(get.get(), set).height(100f).growX(); }else{ cont.field(get.get(), set).growX(); } diff --git a/gradle.properties b/gradle.properties index 032e5b4383..a3af171d84 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=f2ffd0e34f +archash=85daacbf87