You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2020/06/09 17:38:07 UTC
[sis] 03/04: Remove a hack which was not needed. A simple use of
`Label.USE_PREF_SIZE` does the trick.
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 4a90d136a8a35889a911763d36ba2f3556cea39a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Jun 9 14:53:51 2020 +0200
Remove a hack which was not needed. A simple use of `Label.USE_PREF_SIZE` does the trick.
---
.../java/org/apache/sis/internal/gui/Styles.java | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
index d681eeb..5625631 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/gui/Styles.java
@@ -30,8 +30,6 @@ import javafx.scene.layout.ColumnConstraints;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.Priority;
import javafx.scene.layout.RowConstraints;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
import org.apache.sis.util.logging.Logging;
import org.apache.sis.internal.system.Modules;
import org.apache.sis.util.Static;
@@ -176,22 +174,6 @@ public final class Styles extends Static {
final ColumnConstraints controlColumn = new ColumnConstraints();
labelColumn .setHgrow(Priority.NEVER);
controlColumn.setHgrow(Priority.ALWAYS);
- /*
- * I'm not aware of a way to specify that the first column should be always wide enough
- * for showing fully the labels. As a workaround, we set the minimum width to the width
- * of the widest label.
- */
- final ChangeListener<Number> widthFixer = new ChangeListener<>() {
- @Override public void changed(final ObservableValue<? extends Number> e, final Number o, final Number n) {
- final double v = n.doubleValue();
- if (v > o.doubleValue()) {
- if (v > labelColumn.getMinWidth()) {
- labelColumn.setMinWidth(v);
- }
- e.removeListener(this);
- }
- }
- };
gp.getColumnConstraints().setAll(labelColumn, controlColumn);
gp.setPadding(FORM_INSETS);
gp.setVgap(9);
@@ -202,7 +184,7 @@ public final class Styles extends Static {
GridPane.setConstraints(label, 0, row);
GridPane.setConstraints(control, 1, row);
gp.getChildren().addAll(label, control);
- label.widthProperty().addListener(widthFixer);
+ label.setMinWidth(Label.USE_PREF_SIZE);
row++;
}
}