lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-12 15:50:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix icon bindings

Browse Source
This commit is contained in:
crschnick
2025-08-20 16:28:06 +00:00
parent 695de6d32d
commit 1e36e8f5e2
14 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/browser/menu/impl/OpenNativeFileDetailsMenuProvider.java
+6
View File
@@ -8,6 +8,7 @@ import io.xpipe.app.browser.menu.BrowserMenuCategory;
import io.xpipe.app.browser.menu.BrowserMenuLeafProvider;
import io.xpipe.app.core.AppI18n;
import io.xpipe.app.util.LabelGraphic;
import javafx.beans.value.ObservableValue;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyCodeCombination;
@@ -41,4 +42,9 @@ public class OpenNativeFileDetailsMenuProvider implements BrowserMenuLeafProvide
public boolean acceptsEmptySelection() {
return true;
}
@Override
public LabelGraphic getIcon(BrowserFileSystemTabModel model, List<BrowserEntry> entries) {
return new LabelGraphic.IconGraphic("mdi2f-folder-information-outline");
}
}
app/src/main/java/io/xpipe/app/comp/base/ButtonComp.java
+3 -4
View File
@@ -56,16 +56,15 @@ public class ButtonComp extends Comp<CompStructure<Button>> {
var n = t.createGraphicNode();
button.setGraphic(n);
if (n instanceof FontIcon f && button.getFont() != null) {
f.iconSizeProperty().bind(new ReadOnlyIntegerWrapper((int)
new Size(button.getFont().getSize(), SizeUnits.PT).pixels()));
f.setIconSize((int)
new Size(button.getFont().getSize(), SizeUnits.PT).pixels());
}
});
});
button.fontProperty().subscribe(c -> {
if (button.getGraphic() instanceof FontIcon f) {
f.iconSizeProperty()
.bind(new ReadOnlyIntegerWrapper((int) new Size(c.getSize(), SizeUnits.PT).pixels()));
f.setIconSize((int) new Size(c.getSize(), SizeUnits.PT).pixels());
}
});
}
app/src/main/java/io/xpipe/app/comp/base/DropdownComp.java
+1 -2
View File
@@ -54,8 +54,7 @@ public class DropdownComp extends Comp<CompStructure<Button>> {
var graphic = new FontIcon("mdi2c-chevron-double-down");
button.fontProperty().subscribe(c -> {
graphic.iconSizeProperty()
.bind(new ReadOnlyIntegerWrapper((int) new Size(c.getSize(), SizeUnits.PT).pixels()));
graphic.setIconSize((int) new Size(c.getSize(), SizeUnits.PT).pixels());
});
button.setGraphic(graphic);
app/src/main/java/io/xpipe/app/comp/base/IconButtonComp.java
+3 -4
View File
@@ -57,15 +57,14 @@ public class IconButtonComp extends Comp<CompStructure<Button>> {
PlatformThread.runLaterIfNeeded(() -> {
button.setGraphic(labelGraphic.createGraphicNode());
if (button.getGraphic() instanceof FontIcon fi) {
fi.iconSizeProperty().bind(new ReadOnlyIntegerWrapper((int)
new Size(button.getFont().getSize(), SizeUnits.PT).pixels()));
fi.setIconSize((int)
new Size(button.getFont().getSize(), SizeUnits.PT).pixels());
}
});
});
button.fontProperty().subscribe((n) -> {
if (button.getGraphic() instanceof FontIcon fi) {
fi.iconSizeProperty()
.bind(new ReadOnlyIntegerWrapper((int) new Size(n.getSize(), SizeUnits.PT).pixels()));
fi.setIconSize((int) new Size(n.getSize(), SizeUnits.PT).pixels());
}
});
if (listener != null) {
app/src/main/java/io/xpipe/app/comp/base/IntroComp.java
+1 -1
View File
@@ -50,7 +50,7 @@ public class IntroComp extends SimpleComp {
var img = graphic.createGraphicNode();
if (img instanceof FontIcon fontIcon) {
fontIcon.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
fontIcon.setIconSize(80);
}
var text = new VBox(title, introDesc);
text.setSpacing(5);
app/src/main/java/io/xpipe/app/comp/base/TileButtonComp.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class TileButtonComp extends Comp<TileButtonComp.Structure> {
desc.heightProperty()));
pane.prefHeightProperty().addListener((c, o, n) -> {
var size = Math.min(n.intValue(), 100);
fi.getIcon().iconSizeProperty().bind(new ReadOnlyDoubleWrapper(size * iconSize));
fi.getIcon().setIconSize((int) (size * iconSize));
});
bt.setGraphic(hbox);
return Structure.builder()
app/src/main/java/io/xpipe/app/hub/comp/StoreIconComp.java
+1 -1
View File
@@ -37,7 +37,7 @@ public class StoreIconComp extends SimpleComp {
background.getStyleClass().add("background");
var dots = new FontIcon("mdi2d-dots-horizontal");
dots.iconSizeProperty().bind(new ReadOnlyIntegerWrapper((int) (h * 1.3)));
dots.setIconSize((int) (h * 1.3));
var stack = new StackPane(background, storeIcon, dots);
stack.setMinHeight(w + 5);
app/src/main/java/io/xpipe/app/hub/comp/StoreIdentitiesIntroComp.java
+2 -2
View File
@@ -35,7 +35,7 @@ public class StoreIdentitiesIntroComp extends SimpleComp {
introDesc.setMaxWidth(470);
var img = new FontIcon("mdi2a-account-group");
img.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
img.setIconSize(80);
var text = new VBox(title, introDesc);
text.setSpacing(5);
text.setAlignment(Pos.CENTER_LEFT);
@@ -90,7 +90,7 @@ public class StoreIdentitiesIntroComp extends SimpleComp {
syncPane.setAlignment(Pos.CENTER);
var fi = new FontIcon("mdi2g-git");
fi.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
fi.setIconSize(80);
var img = new StackPane(fi);
img.setPrefWidth(100);
img.setPrefHeight(120);
app/src/main/java/io/xpipe/app/hub/comp/StoreIntroComp.java
+1 -1
View File
@@ -80,7 +80,7 @@ public class StoreIntroComp extends SimpleComp {
importPane.setAlignment(Pos.CENTER);
var fi = new FontIcon("mdi2g-git");
fi.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
fi.setIconSize(80);
var img = new StackPane(fi);
img.setPrefWidth(100);
img.setPrefHeight(150);
app/src/main/java/io/xpipe/app/hub/comp/StoreScriptsIntroComp.java
+2 -2
View File
@@ -39,7 +39,7 @@ public class StoreScriptsIntroComp extends SimpleComp {
introDesc.setMaxWidth(470);
var img = new FontIcon("mdi2s-script-text");
img.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
img.setIconSize(80);
var text = new VBox(title, introDesc);
text.setSpacing(5);
text.setAlignment(Pos.CENTER_LEFT);
@@ -80,7 +80,7 @@ public class StoreScriptsIntroComp extends SimpleComp {
importPane.setAlignment(Pos.CENTER);
var fi = new FontIcon("mdi2t-tooltip-edit");
fi.iconSizeProperty().bind(new ReadOnlyIntegerWrapper(80));
fi.setIconSize(80);
var img = new StackPane(fi);
img.setPrefWidth(100);
img.setPrefHeight(150);
app/src/main/java/io/xpipe/app/issue/ErrorHandlerDialog.java
+2 -1
View File
@@ -1,5 +1,6 @@
package io.xpipe.app.issue;
import atlantafx.base.theme.Styles;
import io.xpipe.app.comp.Comp;
import io.xpipe.app.comp.base.ModalButton;
import io.xpipe.app.comp.base.ModalOverlay;
@@ -33,7 +34,7 @@ public class ErrorHandlerDialog {
var headerId = event.isTerminal() ? "terminalErrorOccured" : "errorOccured";
var errorModal = ModalOverlay.of(headerId, comp, new LabelGraphic.NodeGraphic(() -> {
var graphic = new FontIcon("mdomz-warning");
graphic.iconColorProperty().bind(new ReadOnlyObjectWrapper<>(Color.RED));
graphic.pseudoClassStateChanged(Styles.STATE_DANGER, true);
return graphic;
}));
if (event.getThrowable() != null && event.isReportable()) {
app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java
+3 -3
View File
@@ -1,5 +1,6 @@
package io.xpipe.app.prefs;
import atlantafx.base.theme.Styles;
import io.xpipe.app.comp.Comp;
import io.xpipe.app.comp.base.*;
import io.xpipe.app.core.AppI18n;
@@ -61,9 +62,8 @@ public class TerminalCategory extends AppPrefsCategory {
if (item != ExternalTerminalType.CUSTOM) {
var graphic = new FontIcon(
item.isRecommended() ? "mdi2c-check-decagram" : "mdi2a-alert-circle-check");
graphic.iconColorProperty()
.bind(new ReadOnlyObjectWrapper<>(
item.isRecommended() ? Color.GREEN : Color.ORANGE));
graphic.getStyleClass().add("graphic");
graphic.getStyleClass().add(item.isRecommended() ? "supported" : "unsupported");
setGraphic(graphic);
} else {
setGraphic(new FontIcon("mdi2m-minus-circle"));
app/src/main/resources/io/xpipe/app/resources/style/style.css
+7
View File
@@ -158,3 +158,10 @@
-fx-padding: 3 10;
}
.ikonli-font-icon.graphic.supported {
-fx-icon-color: -color-success-fg;
}
.ikonli-font-icon.graphic.unsupported {
-fx-icon-color: -color-warning-fg;
}
gradle/gradle_scripts/atlantafx-base-2.0.2.jar
BIN
View File
Binary file not shown.