mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-19 21:56:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

use fixed width for check state icon in list

Browse Source
This commit is contained in:
Armin Schrenk
2021-07-08 16:01:03 +02:00
parent a9db8eb0d5
commit 8ecb78abec
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/cryptomator/ui/health/CheckListCell.java
+12 -12
View File
@@ -8,21 +8,26 @@ import org.cryptomator.ui.controls.FontAwesome5IconView;
import javafx.beans.binding.Bindings; import javafx.beans.binding.Bindings;
import javafx.geometry.Insets; import javafx.geometry.Insets;
import javafx.geometry.Pos; import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.CheckBox; import javafx.scene.control.CheckBox;
import javafx.scene.control.ContentDisplay; import javafx.scene.control.ContentDisplay;
import javafx.scene.control.ListCell; import javafx.scene.control.ListCell;
import javafx.scene.layout.StackPane;
class CheckListCell extends ListCell<Check> { class CheckListCell extends ListCell<Check> {
private final FontAwesome5IconView stateIcon = new FontAwesome5IconView(); private final FontAwesome5IconView stateIcon = new FontAwesome5IconView();
private CheckBox checkBox = new CheckBox(); private CheckBox checkBox = new CheckBox();
private final StackPane graphicContainer = new StackPane(stateIcon, checkBox);
CheckListCell() { CheckListCell() {
setPadding(new Insets(6)); setPadding(new Insets(6));
setAlignment(Pos.CENTER_LEFT); setAlignment(Pos.CENTER_LEFT);
setContentDisplay(ContentDisplay.LEFT); setContentDisplay(ContentDisplay.LEFT);
getStyleClass().add("label"); getStyleClass().add("label");
graphicContainer.minWidth(20);
graphicContainer.maxWidth(20);
graphicContainer.setAlignment(Pos.CENTER);
EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-muted", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.INFO_CIRCLE)); EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-muted", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.INFO_CIRCLE));
EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-primary", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.CHECK)); EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-primary", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.CHECK));
EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-orange", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.EXCLAMATION_TRIANGLE)); EasyBind.includeWhen(stateIcon.getStyleClass(), "glyph-icon-orange", stateIcon.glyphProperty().isEqualTo(FontAwesome5Icon.EXCLAMATION_TRIANGLE));
@@ -34,26 +39,21 @@ class CheckListCell extends ListCell<Check> {
super.updateItem(item, empty); super.updateItem(item, empty);
if (item != null) { if (item != null) {
setText(item.getLocalizedName()); setText(item.getLocalizedName());
graphicProperty().bind(EasyBind.map(item.stateProperty(),this::chooseNodeFromState)); setGraphic(graphicContainer);
checkBox.visibleProperty().bind(Bindings.createBooleanBinding(() -> item.getState() == Check.CheckState.RUNNABLE, item.stateProperty()));
stateIcon.visibleProperty().bind(Bindings.createBooleanBinding(() -> item.getState() != Check.CheckState.RUNNABLE, item.stateProperty()));
stateIcon.glyphProperty().bind(Bindings.createObjectBinding(() -> glyphForState(item), item.stateProperty(), item.highestResultSeverityProperty())); stateIcon.glyphProperty().bind(Bindings.createObjectBinding(() -> glyphForState(item), item.stateProperty(), item.highestResultSeverityProperty()));
checkBox.selectedProperty().bindBidirectional(item.chosenForExecutionProperty()); checkBox.selectedProperty().bindBidirectional(item.chosenForExecutionProperty());
} else { } else {
graphicProperty().unbind(); graphicProperty();
checkBox.visibleProperty().unbind();
stateIcon.visibleProperty().unbind();
setGraphic(null); setGraphic(null);
setText(null); setText(null);
checkBox.selectedProperty().unbind(); checkBox.selectedProperty().unbind();
} }
} }
// see getGlyph() for relevant glyphs:
private Node chooseNodeFromState(Check.CheckState state) {
if (state == Check.CheckState.RUNNABLE) {
return checkBox;
} else {
return stateIcon;
}
}
private FontAwesome5Icon glyphForState(Check item) { private FontAwesome5Icon glyphForState(Check item) {
return switch (item.getState()) { return switch (item.getState()) {
case RUNNABLE -> null; case RUNNABLE -> null;