Update paging controls visibility logic and default label strategy

Bound visibility and managed properties to consider the `showPagingControls` property for better flexibility. Changed the default `MessageLabelStrategy` to `ALWAYS_SHOW` to ensure consistent paging label display.
dlsc-software-consulting-gmbh · Dec 13, 2024 · 6ac0996 · 6ac0996
1 parent 237cdb9
commit 6ac0996
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/gemsfx-demo/src/main/java/com/dlsc/gemsfx/demo/PagingListViewApp.java b/gemsfx-demo/src/main/java/com/dlsc/gemsfx/demo/PagingListViewApp.java
@@ -73,6 +73,9 @@ public void start(Stage stage) {
         CheckBox simulateDelay = new CheckBox("Simulate delay");
         simulateDelay.selectedProperty().bindBidirectional(simulateDelayProperty);
 
+        CheckBox showPagingControls = new CheckBox("Show paging controls");
+        showPagingControls.selectedProperty().bindBidirectional(pagingListView.showPagingControlsProperty());
+
         ComboBox<Side> location = new ComboBox<>();
         location.getItems().addAll(Side.TOP, Side.BOTTOM);
         location.valueProperty().bindBidirectional(pagingListView.pagingControlsLocationProperty());
@@ -86,7 +89,7 @@ public void start(Stage stage) {
         Button increaseItemCount = new Button("Increase Count");
         increaseItemCount.setOnAction(evt -> count.set(count.get() + 1));
 
-        HBox settingsBox = new HBox(10, fillBox, simulateDelay, new Label("Location"), location, clearSetData, reduceItemCount, increaseItemCount);
+        HBox settingsBox = new HBox(10, fillBox, simulateDelay, showPagingControls, location, clearSetData, reduceItemCount, increaseItemCount);
         settingsBox.setAlignment(Pos.CENTER_LEFT);
 
         VBox box = new VBox(20, pagingListView, settingsBox, new PagingControlsSettingsView(pagingListView), scenicView);

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/PagingControlBase.java b/gemsfx/src/main/java/com/dlsc/gemsfx/PagingControlBase.java
@@ -224,7 +224,7 @@ public enum MessageLabelStrategy {
         ALWAYS_SHOW
     }
 
-    private final ObjectProperty<PagingControls.MessageLabelStrategy> messageLabelStrategy = new SimpleObjectProperty<>(this, "messageLabelStrategy", PagingControls.MessageLabelStrategy.SHOW_WHEN_NEEDED);
+    private final ObjectProperty<PagingControls.MessageLabelStrategy> messageLabelStrategy = new SimpleObjectProperty<>(this, "messageLabelStrategy", MessageLabelStrategy.ALWAYS_SHOW);
 
     public final PagingControls.MessageLabelStrategy getMessageLabelStrategy() {
         return messageLabelStrategy.get();

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/skins/PagingListViewSkin.java b/gemsfx/src/main/java/com/dlsc/gemsfx/skins/PagingListViewSkin.java
@@ -41,9 +41,8 @@ public PagingListViewSkin(PagingListView<T> pagingListView) {
         pagingControls.alignmentProperty().bindBidirectional(pagingListView.alignmentProperty());
         pagingControls.firstLastPageDisplayModeProperty().bindBidirectional(pagingListView.firstLastPageDisplayModeProperty());
         pagingControls.firstPageDividerProperty().bindBidirectional(pagingListView.firstPageDividerProperty());
-        pagingControls.maxPageIndicatorsCountProperty().bindBidirectional(pagingListView.maxPageIndicatorsCountProperty());
-        pagingControls.visibleProperty().bind(pagingControls.neededProperty());
-        pagingControls.managedProperty().bind(pagingControls.neededProperty());
+        pagingControls.visibleProperty().bind(pagingControls.neededProperty().and(pagingListView.showPagingControlsProperty()));
+        pagingControls.managedProperty().bind(pagingControls.neededProperty().and(pagingListView.showPagingControlsProperty()));
 
         content.getStyleClass().add("content");