server
Clone or download
Modified Files
M
src/main/java/com/stream_pi/server/window/dashboard/actiondetailpane/ActionDetailsPane.java
+12
−0
--- '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
@@ -514,6 +514,9 @@ public class ActionDetailsPane extends V
boolean doesDefaultExist = action.getIcons().containsKey("default");
boolean isDefaultHidden = !action.getCurrentIconState().equals("default");
+ if(!doesDefaultExist)
+ isDefaultHidden = false;
+
hideDefaultIconCheckBox.setDisable(!doesDefaultExist);
hideDefaultIconCheckBox.setSelected(isDefaultHidden);
}
@@ -526,6 +529,10 @@ public class ActionDetailsPane extends V
boolean doesToggleOnExist = action.getIcons().containsKey("toggle_on");
boolean isToggleOnHidden = action.getCurrentIconState().contains("toggle_on");
+
+ if(!doesToggleOnExist)
+ isToggleOnHidden = false;
+
hideToggleOnIconCheckBox.setDisable(!doesToggleOnExist);
hideToggleOnIconCheckBox.setSelected(isToggleOnHidden);
@@ -535,6 +542,11 @@ public class ActionDetailsPane extends V
boolean doesToggleOffExist = action.getIcons().containsKey("toggle_off");
boolean isToggleOffHidden = action.getCurrentIconState().contains("toggle_off");
+
+
+ if(!doesToggleOffExist)
+ isToggleOffHidden = false;
+
hideToggleOffIconCheckBox.setDisable(!doesToggleOffExist);
hideToggleOffIconCheckBox.setSelected(isToggleOffHidden);
}
--- '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
@@ -381,9 +381,12 @@ public class ActionBox extends StackPane
}
else
{
- if(action.isHasIcon() && action.isShowIcon())
+ if(action.isHasIcon())
{
- setIcon(action.getDefaultIcon());
+ if(!action.getCurrentIconState().isBlank())
+ {
+ setIcon(action.getCurrentIcon());
+ }
}
else
{