From: Debayan Sutradhar Date: Sat, 29 May 2021 16:44:28 +0530 Subject: Fix #52 --- Fix #52 --- --- '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 @@ -271,11 +271,10 @@ public class ActionDetailsPane extends V clearIconButton = new Button("Clear Icon"); clearIconButton.managedProperty().bind(clearIconButton.visibleProperty()); - clearIconButton.setOnAction(event -> { - + clearIconButton.setOnAction(event -> + { hideDefaultIconCheckBox.setDisable(true); hideDefaultIconCheckBox.setSelected(false); - hideToggleOffIconCheckBox.setDisable(true); hideToggleOffIconCheckBox.setSelected(false); @@ -343,8 +342,7 @@ public class ActionDetailsPane extends V normalToggleActionCommonPropsVBox = new VBox( displayTextColourHBox, alignmentHBox, - bgColourHBox, - clearIconHBox + bgColourHBox ); normalToggleActionCommonPropsVBox.managedProperty().bind(normalToggleActionCommonPropsVBox.visibleProperty()); @@ -371,7 +369,8 @@ public class ActionDetailsPane extends V toggleActionsPropsVBox.setSpacing(10.0); vbox.getChildren().addAll(displayTextFieldHBox,normalToggleActionCommonPropsVBox, - normalActionsPropsVBox, toggleActionsPropsVBox, clientPropertiesVBox, + normalActionsPropsVBox, toggleActionsPropsVBox, + clearIconHBox, clientPropertiesVBox, pluginExtraButtonBar); vbox.setVisible(false); @@ -620,8 +619,6 @@ public class ActionDetailsPane extends V openFolderButton.setVisible(false); resetToDefaultsButton.setVisible(false); returnButtonForCombineActionChild.setVisible(false); - clearIconButton.setVisible(false); - scrollPane.setVbarPolicy(ScrollPane.ScrollBarPolicy.NEVER); buttonBar.setVisible(false); --- '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 @@ -134,15 +134,11 @@ public class OnSaveActionTask extends Ta if(isClearIcon) { - action.setIcons(null); + action.getIcons().clear(); action.setCurrentIconState(""); } - logger.info("isHideDEfaultIcon : "+isHideDefaultIcon); - logger.info("isHideDEfaultIcon : "+isHideToggleOffIcon); - logger.info("isHideDEfaultIcon : "+isHideToggleOnIcon); - if(action.getActionType() == ActionType.NORMAL || action.getActionType() == ActionType.FOLDER || action.getActionType() == ActionType.COMBINE)