mirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-04-23 08:00:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add clear functionality for choice comps

Browse Source
This commit is contained in:
crschnick
2025-03-11 04:28:51 +00:00
parent f5f14a441f
commit b2efb8ddfa
3 changed files with 56 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/io/xpipe/app/comp/store/StoreChoiceComp.java
View File

@@ -24,6 +24,7 @@ import javafx.beans.property.SimpleStringProperty;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.MenuButton;
import javafx.scene.input.MouseButton;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
@@ -224,6 +225,14 @@ public class StoreChoiceComp<T extends DataStore> extends SimpleComp {
}
event.consume();
});
struc.get().setOnMouseClicked(event -> {
if (event.getButton() != MouseButton.SECONDARY) {
return;
}
selected.setValue(mode == Mode.PROXY ? DataStorage.get().local().ref() : null);
event.consume();
});
})
.styleClass("choice-comp");

12
app/src/main/resources/io/xpipe/app/resources/style/choice-comp.css
View File

@@ -2,6 +2,18 @@
-fx-focus-color: transparent;
}
.combo-box-base:hover .arrow-button:hover .arrow {
-fx-background-color: -color-accent-fg;
}
.identity-select-comp .clear-button:hover .ikonli-font-icon {
-fx-icon-color: -color-accent-fg;
}
.identity-select-comp .clear-button {
-fx-background-color: transparent;
}
.combo-box-popup .list-cell:hover, .combo-box-popup .list-cell:focused {
-fx-background-color: -color-context-menu;
}

40
ext/base/src/main/java/io/xpipe/ext/base/identity/IdentitySelectComp.java
View File

@@ -3,12 +3,11 @@ package io.xpipe.ext.base.identity;
import io.xpipe.app.comp.Comp;
import io.xpipe.app.comp.CompStructure;
import io.xpipe.app.comp.SimpleCompStructure;
import io.xpipe.app.comp.base.ButtonComp;
import io.xpipe.app.comp.base.ComboTextFieldComp;
import io.xpipe.app.comp.base.HorizontalComp;
import io.xpipe.app.comp.base.*;
import io.xpipe.app.comp.store.StoreCreationComp;
import io.xpipe.app.comp.store.StoreEntryWrapper;
import io.xpipe.app.comp.store.StoreViewState;
import io.xpipe.app.core.AppFontSizes;
import io.xpipe.app.core.AppI18n;
import io.xpipe.app.ext.DataStoreCreationCategory;
import io.xpipe.app.storage.DataStorage;
@@ -29,12 +28,16 @@ import javafx.collections.ListChangeListener;
import javafx.scene.control.ListCell;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.HBox;
import atlantafx.base.theme.Styles;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
public class IdentitySelectComp extends Comp<CompStructure<HBox>> {
@@ -201,6 +204,8 @@ public class IdentitySelectComp extends Comp<CompStructure<HBox>> {
var s = formatName(newValue.get());
prop.setValue(s);
});
} else {
prop.setValue(null);
}
});
@@ -218,7 +223,6 @@ public class IdentitySelectComp extends Comp<CompStructure<HBox>> {
};
});
combo.apply(struc -> struc.get().setEditable(allowUserInput));
combo.hgrow();
combo.styleClass(Styles.LEFT_PILL);
combo.grow(false, true);
combo.apply(struc -> {
@@ -258,6 +262,32 @@ public class IdentitySelectComp extends Comp<CompStructure<HBox>> {
});
});
return combo;
var clearButton = new IconButtonComp("mdi2c-close", () -> {
selectedReference.setValue(null);
inPlaceUser.setValue(null);
});
clearButton.styleClass(Styles.FLAT);
clearButton.hide(selectedReference.isNull());
clearButton.apply(struc -> {
struc.get().setOpacity(0.7);
struc.get().getStyleClass().add("clear-button");
AppFontSizes.xs(struc.get());
AnchorPane.setRightAnchor(struc.get(), 30.0);
AnchorPane.setTopAnchor(struc.get(), 3.0);
AnchorPane.setBottomAnchor(struc.get(), 3.0);
});
var stack = new AnchorComp(List.of(combo, clearButton));
stack.styleClass("identity-select-comp");
stack.hgrow();
stack.apply(struc -> {
var comboRegion = (Region) struc.get().getChildren().getFirst();
struc.get().prefWidthProperty().bind(comboRegion.prefWidthProperty());
struc.get().prefHeightProperty().bind(comboRegion.prefHeightProperty());
AnchorPane.setLeftAnchor(comboRegion, 0.0);
AnchorPane.setRightAnchor(comboRegion, 0.0);
});
return stack;
}
}