这是indexloc提供的服务，不要输入任何密码
Skip to content

feat(selection-box): wrap options in ScrollPane and add directional extra nodes #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 4, 2025
Merged

feat(selection-box): wrap options in ScrollPane and add directional extra nodes #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c7800
feat(selection-box): wrap options in ScrollPane and add directional e…
leewyatt Jan 31, 2025
05b01b6
Remove unused DEFAULT_SHOW_EXTRA_BUTTON constant
leewyatt Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 35 additions & 27 deletions gemsfx-demo/src/main/java/com/dlsc/gemsfx/demo/SelectionBoxApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import javafx.scene.control.Button;
import javafx.scene.control.CheckBox;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Label;
import javafx.scene.control.SelectionMode;
import javafx.scene.control.SplitPane;
import javafx.scene.layout.Region;
Expand All @@ -23,11 +24,27 @@
public class SelectionBoxApp extends Application {

private final SelectionBox<String> selectionBox = new SelectionBox<>();
private final StackPane topNode = new StackPane();
private final StackPane bottomNode = new StackPane();
private final StackPane leftNode = new StackPane();
private final StackPane rightNode = new StackPane();

@Override
public void start(Stage primaryStage) throws Exception {
selectionBox.show();

topNode.setStyle("-fx-background-color: lightblue;-fx-padding: 10;");
topNode.getChildren().add(new Label("Top"));

bottomNode.getChildren().add(new Label("Bottom"));
bottomNode.setStyle("-fx-background-color: lightcoral;-fx-padding: 10;");

leftNode.getChildren().add(new Label("Left"));
leftNode.setStyle("-fx-background-color: lightgreen;-fx-padding: 10;");

rightNode.getChildren().add(new Label("Right"));
rightNode.setStyle("-fx-background-color: lightyellow;-fx-padding: 10;");

SplitPane splitPane = new SplitPane();
splitPane.setDividerPositions(0.7);
splitPane.getItems().addAll(createControl(), getControlPanel());
Expand Down Expand Up @@ -60,9 +77,23 @@ private Node getControlPanel() {
selectionModeComboBox.getItems().addAll(SelectionMode.SINGLE, SelectionMode.MULTIPLE);
selectionModeComboBox.valueProperty().bindBidirectional(selectionBox.getSelectionModel().selectionModeProperty());

// visible extra buttons
CheckBox visibleExtraButtonsCheckBox = new CheckBox("Show Extra Buttons");
visibleExtraButtonsCheckBox.selectedProperty().bindBidirectional(selectionBox.showExtraButtonsProperty());
// show extra nodes
CheckBox showExtraNodesCheckBox = new CheckBox("Show Extra Nodes");
// cache the top node
Node selectionBoxTop = selectionBox.getTop();
showExtraNodesCheckBox.selectedProperty().subscribe(showExtraNodes -> {
if (showExtraNodes) {
selectionBox.setTop(topNode);
selectionBox.setBottom(bottomNode);
selectionBox.setLeft(leftNode);
selectionBox.setRight(rightNode);
} else {
selectionBox.setTop(selectionBoxTop);
selectionBox.setBottom(null);
selectionBox.setLeft(null);
selectionBox.setRight(null);
}
});

// prompt text
CheckBox promptTextCheckBox = new CheckBox("Change Prompt Text");
Expand All @@ -75,27 +106,6 @@ private Node getControlPanel() {
}
});

// change extra buttons
Button changeExtraButtonsButton = new Button("Change Extra Buttons");
changeExtraButtonsButton.setMaxWidth(Double.MAX_VALUE);
changeExtraButtonsButton.setOnAction(e ->
selectionBox.setExtraButtonsProvider(model -> switch (model.getSelectionMode()) {
case SINGLE -> List.of(
selectionBox.createExtraButton("Select Previous", model::selectPrevious),
selectionBox.createExtraButton("Select Next", model::selectNext)
);
case MULTIPLE -> List.of(
selectionBox.createExtraButton("Select First", model::selectFirst),
selectionBox.createExtraButton("Select Last", model::selectLast)
);
})
);

// extra buttons position
ComboBox<SelectionBox.VerticalPosition> extraButtonsPositionComboBox = new ComboBox<>();
extraButtonsPositionComboBox.getItems().addAll(SelectionBox.VerticalPosition.values());
extraButtonsPositionComboBox.valueProperty().bindBidirectional(selectionBox.extraButtonsPositionProperty());

// use custom string converter
CheckBox useCustomStringConverterCheckBox = new CheckBox("Use Custom String Converter");
useCustomStringConverterCheckBox.selectedProperty().addListener((obs, oldVal, newVal) -> {
Expand Down Expand Up @@ -224,10 +234,8 @@ public List<String> fromString(String string) {
"SelectionBox",
new SimpleControlPane.ControlItem("Show Popup", showButton),
new SimpleControlPane.ControlItem("Selection Mode", selectionModeComboBox),
new SimpleControlPane.ControlItem("Show Extra Nodes", showExtraNodesCheckBox),
new SimpleControlPane.ControlItem("Change Prompt Text", promptTextCheckBox),
new SimpleControlPane.ControlItem("Show Extra Buttons", visibleExtraButtonsCheckBox),
new SimpleControlPane.ControlItem("Change Extra Buttons", changeExtraButtonsButton),
new SimpleControlPane.ControlItem("Extra Buttons Position", extraButtonsPositionComboBox),
new SimpleControlPane.ControlItem("Use Custom String Converter", useCustomStringConverterCheckBox),
new SimpleControlPane.ControlItem("Auto Hide On Select", autoHideOnSelectCheckBox),
new SimpleControlPane.ControlItem("Select Method", selectTestButtonsBox),
Expand Down
74 changes: 45 additions & 29 deletions gemsfx/src/main/java/com/dlsc/gemsfx/DayOfWeekPicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import com.dlsc.gemsfx.util.SimpleStringConverter;
import javafx.scene.control.Button;
import javafx.scene.control.SelectionMode;
import javafx.scene.layout.VBox;

import java.time.DayOfWeek;
import java.time.LocalDate;
Expand Down Expand Up @@ -36,35 +37,8 @@ public DayOfWeekPicker() {
// Set Items
getItems().setAll(getLocalizedDayOrder());

// Set Extra Buttons Provider
setExtraButtonsProvider(model -> switch (model.getSelectionMode()) {
case SINGLE -> {
// Button tomorrowButton = createExtraButton("Tomorrow", () -> model.clearAndSelect(getItems().indexOf(LocalDate.now().getDayOfWeek().plus(1))));
// Button yesterdayButton = createExtraButton("Yesterday", () -> model.clearAndSelect(getItems().indexOf(LocalDate.now().getDayOfWeek().minus(1))));
Button todayButton = createExtraButton("Today", () -> model.clearAndSelect(getItems().indexOf(LocalDate.now().getDayOfWeek())));
Button clearButton = createExtraButton("Clear", model::clearSelection);
yield List.of(clearButton, todayButton);
}
case MULTIPLE -> {
// When clicking on the button, it will clear the current selection and select all weekdays
Button weekdaysButton = createExtraButton("Weekdays", () -> {
getSelectionModel().clearSelection();
for (DayOfWeek day : getWeekdays()) {
getSelectionModel().select(day);
}
});
// When clicking on the button, it will clear the current selection and select all weekend days
Button weekendsButton = createExtraButton("Weekends", () -> {
getSelectionModel().clearSelection();
for (DayOfWeek day : getWeekendDays()) {
getSelectionModel().select(day);
}
});
Button clearButton = createExtraButton("Clear", model::clearSelection);
Button anyDayButton = createExtraButton("Any Day", model::selectAll);
yield List.of(clearButton, anyDayButton, weekdaysButton, weekendsButton);
}
});
// Add quick selection buttons to the top of the popup
setTop(createExtraButtonsBox());

// set item converter
setItemConverter(new SimpleStringConverter<>(dayOfWeek -> dayOfWeek.getDisplayName(TextStyle.FULL, Locale.getDefault())));
Expand Down Expand Up @@ -102,6 +76,48 @@ public DayOfWeekPicker() {
}));
}

private VBox createExtraButtonsBox() {
Button clearButton = createExtraButton("Clear", () -> getSelectionModel().clearSelection());
clearButton.getStyleClass().add("clear-button");
clearButton.managedProperty().bind(clearButton.visibleProperty());
clearButton.visibleProperty().bind(itemsProperty().isNotNull().and(itemsProperty().emptyProperty().not()));

Button todayButton = createExtraButton("Today", () -> getSelectionModel().clearAndSelect(getItems().indexOf(LocalDate.now().getDayOfWeek())));
todayButton.getStyleClass().add("today-button");
todayButton.managedProperty().bind(todayButton.visibleProperty());
todayButton.visibleProperty().bind(currentSelectionModeProperty().isEqualTo(SelectionMode.SINGLE));

Button allButton = createExtraButton("All Days", () -> getSelectionModel().selectAll());
allButton.getStyleClass().add("select-all-button");
allButton.managedProperty().bind(allButton.visibleProperty());
allButton.visibleProperty().bind(currentSelectionModeProperty().isEqualTo(SelectionMode.MULTIPLE));

Button weekdaysButton = createExtraButton("Weekdays", () -> {
getSelectionModel().clearSelection();
for (DayOfWeek day : getWeekdays()) {
getSelectionModel().select(day);
}
});
weekdaysButton.getStyleClass().add("weekdays-button");
weekdaysButton.managedProperty().bind(weekdaysButton.visibleProperty());
weekdaysButton.visibleProperty().bind(currentSelectionModeProperty().isEqualTo(SelectionMode.MULTIPLE));

Button weekendsButton = createExtraButton("Weekends", () -> {
getSelectionModel().clearSelection();
for (DayOfWeek day : getWeekendDays()) {
getSelectionModel().select(day);
}
});
weekendsButton.getStyleClass().add("weekends-button");
weekendsButton.managedProperty().bind(weekendsButton.visibleProperty());
weekendsButton.visibleProperty().bind(currentSelectionModeProperty().isEqualTo(SelectionMode.MULTIPLE));

VBox extraButtonsBox = new VBox(clearButton, todayButton, allButton, weekdaysButton, weekendsButton);
extraButtonsBox.getStyleClass().addAll("extra-buttons-box");

return extraButtonsBox;
}

private List<List<DayOfWeek>> mergeConsecutiveItem(List<DayOfWeek> selectedDays) {
List<DayOfWeek> days = new ArrayList<>(selectedDays);
if (days.isEmpty()) {
Expand Down
Loading