update styles

FCL-Team · Apr 6, 2024 · 818d4be · 818d4be
1 parent b1cde42
commit 818d4be
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/FCL/src/main/java/com/tungsten/fcl/control/data/ButtonStyles.java b/FCL/src/main/java/com/tungsten/fcl/control/data/ButtonStyles.java
@@ -55,7 +55,6 @@ private static void updateStylesStorages() {
     }
 
     static {
-        init();
         styles.addListener(onInvalidating(ButtonStyles::updateStylesStorages));
         styles.addListener(onInvalidating(ButtonStyles::checkStyles));
     }

diff --git a/FCL/src/main/java/com/tungsten/fcl/control/data/DirectionStyles.java b/FCL/src/main/java/com/tungsten/fcl/control/data/DirectionStyles.java
@@ -55,7 +55,6 @@ private static void updateStylesStorages() {
     }
 
     static {
-        init();
         styles.addListener(onInvalidating(DirectionStyles::updateStylesStorages));
         styles.addListener(onInvalidating(DirectionStyles::checkStyles));
     }

diff --git a/FCL/src/main/java/com/tungsten/fcl/setting/Controller.java b/FCL/src/main/java/com/tungsten/fcl/setting/Controller.java
@@ -334,6 +334,8 @@ public Controller deserialize(JsonElement json, Type typeOfT, JsonDeserializatio
 
             List<ControlButtonStyle> buttonStyles = gson.fromJson(Optional.ofNullable(obj.get("buttonStyles")).map(JsonElement::getAsJsonArray).orElse(new JsonArray()), new TypeToken<ArrayList<ControlButtonStyle>>() {}.getType());
             List<ControlDirectionStyle> directionStyles = gson.fromJson(Optional.ofNullable(obj.get("directionStyles")).map(JsonElement::getAsJsonArray).orElse(new JsonArray()), new TypeToken<ArrayList<ControlDirectionStyle>>() {}.getType());
+            ButtonStyles.init();
+            DirectionStyles.init();
             buttonStyles.forEach(ButtonStyles::addStyle);
             directionStyles.forEach(DirectionStyles::addStyle);
             ObservableList<ControlViewGroup> viewGroups = FXCollections.observableList(gson.fromJson(Optional.ofNullable(obj.get("viewGroups")).map(JsonElement::getAsJsonArray).orElse(new JsonArray()), new TypeToken<ArrayList<ControlViewGroup>>(){}.getType()));
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,7 +55,6 @@ private static void updateStylesStorages() { @@
         }
         static {
-            init();
             styles.addListener(onInvalidating(ButtonStyles::updateStylesStorages));
             styles.addListener(onInvalidating(ButtonStyles::checkStyles));
         }
@@ Expand Down @@