server
Clone or download
Modified Files
--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java
@@ -346,19 +346,21 @@ public class ActionDetailsPane extends V
normalToggleActionCommonPropsVBox.managedProperty().bind(normalToggleActionCommonPropsVBox.visibleProperty());
normalToggleActionCommonPropsVBox.setSpacing(10.0);
+ FileChooser.ExtensionFilter iconExtensions = new FileChooser.ExtensionFilter("Images", "*.jpeg", "*.jpg", "*.png", "*.gif");
+
normalActionsPropsVBox = new VBox(
new HBoxInputBoxWithFileChooser("Icon", defaultIconFileTextField, hideDefaultIconCheckBox,
- new FileChooser.ExtensionFilter("Images", "*.jpeg", "*.jpg", "*.png", "*.gif"))
+ iconExtensions)
);
normalActionsPropsVBox.managedProperty().bind(normalActionsPropsVBox.visibleProperty());
normalActionsPropsVBox.setSpacing(10.0);
toggleActionsPropsVBox = new VBox(
new HBoxInputBoxWithFileChooser("Toggle Off Icon", toggleOffIconFileTextField, hideToggleOffIconCheckBox,
- new FileChooser.ExtensionFilter("Images", "*.jpeg", "*.jpg", "*.png", "*.gif")),
+ iconExtensions),
new HBoxInputBoxWithFileChooser("Toggle On Icon", toggleOnIconFileTextField, hideToggleOnIconCheckBox,
- new FileChooser.ExtensionFilter("Images", "*.jpeg", "*.jpg", "*.png", "*.gif"))
+ iconExtensions)
);
toggleActionsPropsVBox.managedProperty().bind(toggleActionsPropsVBox.visibleProperty());
--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/OnSaveActionTask.java
@@ -236,7 +236,7 @@ public class OnSaveActionTask extends Ta
if(!isCombineChild)
{
Platform.runLater(()->{
- actionBox.clear();
+ // actionBox.clear();
actionBox.setAction(action);
//actionBox.baseInit();
actionBox.init();
--- 'a/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java'
+++ b/src/main/java/com/stream_pi/server/window/dashboard/actiongridpane/ActionBox.java
@@ -391,13 +391,21 @@ public class ActionBox extends StackPane
}
setBackground(null);
- removeFontIcon();
- fontIcon = new FontIcon();
+
+ if(fontIcon!=null)
+ {
+ fontIcon.getStyleClass().clear();
+ }
+ else
+ {
+ fontIcon = new FontIcon();
+ fontIcon.setIconSize((int) (size * 0.8));
+ getChildren().add(fontIcon);
+ }
+
fontIcon.getStyleClass().add(styleClass);
- fontIcon.setIconSize((int) (size * 0.8));
- getChildren().add(fontIcon);
fontIcon.toBack();
}
@@ -451,6 +459,9 @@ public class ActionBox extends StackPane
public void init(boolean start)
{
+ setBackground(null);
+ setStyle(null);
+
if(getAction().isShowDisplayText())
setDisplayTextLabel(getAction().getDisplayText());
else