update styles
This commit is contained in:
parent
b1cde42602
commit
818d4beeda
|
@ -55,7 +55,6 @@ public class ButtonStyles {
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
init();
|
|
||||||
styles.addListener(onInvalidating(ButtonStyles::updateStylesStorages));
|
styles.addListener(onInvalidating(ButtonStyles::updateStylesStorages));
|
||||||
styles.addListener(onInvalidating(ButtonStyles::checkStyles));
|
styles.addListener(onInvalidating(ButtonStyles::checkStyles));
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,7 +55,6 @@ public class DirectionStyles {
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
init();
|
|
||||||
styles.addListener(onInvalidating(DirectionStyles::updateStylesStorages));
|
styles.addListener(onInvalidating(DirectionStyles::updateStylesStorages));
|
||||||
styles.addListener(onInvalidating(DirectionStyles::checkStyles));
|
styles.addListener(onInvalidating(DirectionStyles::checkStyles));
|
||||||
}
|
}
|
||||||
|
|
|
@ -334,6 +334,8 @@ public class Controller implements Cloneable, Observable {
|
||||||
|
|
||||||
List<ControlButtonStyle> buttonStyles = gson.fromJson(Optional.ofNullable(obj.get("buttonStyles")).map(JsonElement::getAsJsonArray).orElse(new JsonArray()), new TypeToken<ArrayList<ControlButtonStyle>>() {}.getType());
|
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());
|
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);
|
buttonStyles.forEach(ButtonStyles::addStyle);
|
||||||
directionStyles.forEach(DirectionStyles::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()));
|
ObservableList<ControlViewGroup> viewGroups = FXCollections.observableList(gson.fromJson(Optional.ofNullable(obj.get("viewGroups")).map(JsonElement::getAsJsonArray).orElse(new JsonArray()), new TypeToken<ArrayList<ControlViewGroup>>(){}.getType()));
|
||||||
|
|
Loading…
Reference in New Issue