From 374d5d61576c3010c030f37587f363700c439bde Mon Sep 17 00:00:00 2001 From: Andrei Molnar <1995am@pm.me> Date: Tue, 17 Nov 2026 16:56:43 +0100 Subject: [PATCH] Packing de dialogos --- .../java/com/molnarandrei/sopa/Utils.java | 3 +- .../molnarandrei/sopa/step/StepService.java | 7 ++--- .../sopa/testcase/TestCaseService.java | 4 +-- .../sopa/ui/create/CreateProjectDialog.java | 5 ++- .../com/molnarandrei/sopa/ui/lib/Packing.java | 31 +++++++++++++++++++ .../sopa/ui/navpane/DeleteDialog.java | 3 +- 6 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/molnarandrei/sopa/ui/lib/Packing.java diff --git a/src/main/java/com/molnarandrei/sopa/Utils.java b/src/main/java/com/molnarandrei/sopa/Utils.java index 9b75de0..ca76a9f 100644 --- a/src/main/java/com/molnarandrei/sopa/Utils.java +++ b/src/main/java/com/molnarandrei/sopa/Utils.java @@ -1,5 +1,6 @@ package com.molnarandrei.sopa; +import com.molnarandrei.sopa.ui.lib.Packing; import javafx.application.Platform; import javafx.scene.control.Alert; @@ -126,7 +127,7 @@ public class Utils { */ public static void alert(Alert.AlertType type, String title, String header, String content) { Platform.runLater(() -> { - var alert = new Alert(type); + var alert = Packing.pack(new Alert(type)); alert.setTitle(title); alert.setHeaderText(header); alert.setContentText(content); diff --git a/src/main/java/com/molnarandrei/sopa/step/StepService.java b/src/main/java/com/molnarandrei/sopa/step/StepService.java index eddc900..d3ccba5 100644 --- a/src/main/java/com/molnarandrei/sopa/step/StepService.java +++ b/src/main/java/com/molnarandrei/sopa/step/StepService.java @@ -6,15 +6,12 @@ import com.molnarandrei.sopa.trash.TrashService; import com.molnarandrei.sopa.Utils; import com.molnarandrei.sopa.data.RepositoryException; import com.molnarandrei.sopa.data.yaml.Step; -import com.molnarandrei.sopa.data.yaml.TestCase; -import com.molnarandrei.sopa.step.StepRepository; -import com.molnarandrei.sopa.testcase.TestCaseRepository; +import com.molnarandrei.sopa.ui.lib.Packing; import javafx.scene.control.TextInputDialog; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; @@ -41,7 +38,7 @@ public class StepService { } public static void create(Path testCasePath) { - var input = new TextInputDialog(); + var input = Packing.pack(new TextInputDialog()); input.setTitle("Crear paso en prueba"); input.setHeaderText("Nombre del paso"); var name = input.showAndWait().orElse(""); diff --git a/src/main/java/com/molnarandrei/sopa/testcase/TestCaseService.java b/src/main/java/com/molnarandrei/sopa/testcase/TestCaseService.java index b5180c0..ec91119 100644 --- a/src/main/java/com/molnarandrei/sopa/testcase/TestCaseService.java +++ b/src/main/java/com/molnarandrei/sopa/testcase/TestCaseService.java @@ -4,9 +4,9 @@ import com.molnarandrei.sopa.data.yaml.Kind; import com.molnarandrei.sopa.trash.TrashService; import com.molnarandrei.sopa.step.StepService; import com.molnarandrei.sopa.Utils; -import com.molnarandrei.sopa.testcase.TestCaseRepository; import com.molnarandrei.sopa.data.RepositoryException; import com.molnarandrei.sopa.data.yaml.TestCase; +import com.molnarandrei.sopa.ui.lib.Packing; import javafx.scene.control.TextInputDialog; import java.io.IOException; @@ -39,7 +39,7 @@ public class TestCaseService { } public static void create(Path projectPath) { - var input = new TextInputDialog(); + var input = Packing.pack(new TextInputDialog()); input.setTitle("Crear caso de prueba"); input.setHeaderText("Nombre del caso"); var name = input.showAndWait().orElse(""); diff --git a/src/main/java/com/molnarandrei/sopa/ui/create/CreateProjectDialog.java b/src/main/java/com/molnarandrei/sopa/ui/create/CreateProjectDialog.java index 6d3e965..c5e2848 100644 --- a/src/main/java/com/molnarandrei/sopa/ui/create/CreateProjectDialog.java +++ b/src/main/java/com/molnarandrei/sopa/ui/create/CreateProjectDialog.java @@ -10,6 +10,7 @@ import com.molnarandrei.sopa.soap.SoapVersion; import com.molnarandrei.sopa.wsdl.WsdlRemote; import com.molnarandrei.sopa.wsdl.WsdlService; import com.molnarandrei.sopa.ui.editor.HeadersPane; +import com.molnarandrei.sopa.ui.lib.Packing; import javafx.application.Platform; import javafx.geometry.Insets; import javafx.geometry.Pos; @@ -131,10 +132,12 @@ public class CreateProjectDialog extends Stage { form.setCenter(headersPane); form.setBottom(new VBox(8, new Separator(), status, actions)); - var scene = new Scene(form, 600, 480); + form.setPrefWidth(600); + var scene = new Scene(form); if (owner != null && owner.getScene() != null) scene.getStylesheets().addAll(owner.getScene().getStylesheets()); setScene(scene); + Packing.pack(this, scene); } private void choosePath() { diff --git a/src/main/java/com/molnarandrei/sopa/ui/lib/Packing.java b/src/main/java/com/molnarandrei/sopa/ui/lib/Packing.java new file mode 100644 index 0000000..d5d22e3 --- /dev/null +++ b/src/main/java/com/molnarandrei/sopa/ui/lib/Packing.java @@ -0,0 +1,31 @@ +package com.molnarandrei.sopa.ui.lib; + +import javafx.scene.Scene; +import javafx.scene.control.Dialog; +import javafx.scene.layout.Region; +import javafx.stage.Stage; + +public final class Packing { + private Packing() {} + + public static > D pack(D dialog) { + var pane = dialog.getDialogPane(); + pane.setMinHeight(Region.USE_PREF_SIZE); + pane.setMinWidth(Region.USE_PREF_SIZE); + dialog.setResizable(true); + return dialog; + } + + public static void pack(Stage stage, Scene scene) { + var lastNeeded = new double[] { -1 }; + scene.addPostLayoutPulseListener(() -> { + if (! stage.isShowing()) return; + var root = scene.getRoot(); + var needed = Math.ceil(root.prefHeight(scene.getWidth())); + if (needed == lastNeeded[0]) return; + lastNeeded[0] = needed; + var missing = needed - scene.getHeight(); + if (missing > 0) stage.setHeight(stage.getHeight() + missing); + }); + } +} diff --git a/src/main/java/com/molnarandrei/sopa/ui/navpane/DeleteDialog.java b/src/main/java/com/molnarandrei/sopa/ui/navpane/DeleteDialog.java index 553538a..f49dea7 100644 --- a/src/main/java/com/molnarandrei/sopa/ui/navpane/DeleteDialog.java +++ b/src/main/java/com/molnarandrei/sopa/ui/navpane/DeleteDialog.java @@ -6,6 +6,7 @@ import com.molnarandrei.sopa.step.StepRepository; import com.molnarandrei.sopa.step.StepService; import com.molnarandrei.sopa.testcase.TestCaseRepository; import com.molnarandrei.sopa.testcase.TestCaseService; +import com.molnarandrei.sopa.ui.lib.Packing; import javafx.scene.control.Alert; import javafx.scene.control.ButtonBar; import javafx.scene.control.ButtonType; @@ -16,7 +17,7 @@ public class DeleteDialog { private static final ButtonType CANCEL = new ButtonType("Cancelar", ButtonBar.ButtonData.CANCEL_CLOSE); public static void confirmAndDelete(TreeIdentity identity) { - var alert = new Alert(Alert.AlertType.CONFIRMATION, "", DELETE, CANCEL); + var alert = Packing.pack(new Alert(Alert.AlertType.CONFIRMATION, "", DELETE, CANCEL)); alert.setTitle("Eliminar"); alert.setHeaderText("Seguro que desea eliminar el %s %s?".formatted(kindName(identity), nameOf(identity))); alert.setContentText(identity.path().getParent().toString());