Skip to content
Snippets Groups Projects
Commit 408dc186 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#157 - Removed calls to old setCustomDesign method

parent 0d948a2d
No related branches found
No related tags found
No related merge requests found
......@@ -66,11 +66,11 @@ public class DesktopColorPickerView implements Consumer<DisplayableColor>, Event
PadSettings padSettings = pad.getPadSettings();
if (event.getButton() == MouseButton.PRIMARY) {
padSettings.setCustomDesign(true);
ModernCartDesign design = padSettings.getDesign();
design.setEnableCustomBackgroundColor(true);
colorModeHandler.setColor(design, selectedColor);
} else if (event.getButton() == MouseButton.SECONDARY) {
padSettings.setCustomDesign(false);
padSettings.getDesign().setEnableCustomBackgroundColor(false);
}
PlayPadMain.getProgramInstance().getMainViewController().loadUserCss();
}
......
......@@ -78,7 +78,6 @@ public class ProjectJsonReader {
ModernCartDesign design = readModernCartDesign(pad, object.getJSONObject("design"));
if (design != null) {
pad.getPadSettings().setDesign(design);
pad.getPadSettings().setCustomDesign(true); // TODO Sync
}
}
......
......@@ -35,7 +35,6 @@ public class PadSettings {
private ObjectProperty<Duration> warningProperty = new SimpleObjectProperty<>();
private ObjectProperty<Duration> cueInProperty = new SimpleObjectProperty<>();
private BooleanProperty customDesignProperty = new SimpleBooleanProperty(false);
private ModernCartDesign design;
private Map<TriggerPoint, Trigger> triggers = new EnumMap<>(TriggerPoint.class);
......@@ -187,14 +186,6 @@ public class PadSettings {
return cueInProperty.get();
}
public void setCustomDesign(boolean customLayout) {
this.customDesignProperty.set(customLayout);
}
public BooleanProperty customDesignProperty() {
return customDesignProperty;
}
public ModernCartDesign getDesign() {
if (design == null) {
ModernCartDesign newDesign = new ModernCartDesign.ModernCartDesignBuilder(pad).build();
......
......@@ -72,9 +72,6 @@ public class PadSettingsSerializer {
// Layout
Element designElement = settingsElement.element(DESIGN_ELEMENT);
if (designElement != null) {
if (designElement.attributeValue(CUSTOM_DESIGN_ELEMENT) != null) {
padSettings.setCustomDesign(Boolean.parseBoolean(designElement.attributeValue(CUSTOM_DESIGN_ELEMENT)));
}
ModernCartDesignSerializer serializer = new ModernCartDesignSerializer();
ModernCartDesign design = serializer.load(designElement, pad);
padSettings.setDesign(design);
......
......@@ -41,13 +41,11 @@ public class DesignUpdateListener implements ServerListener {
if (field.equals(PropertyDef.DESIGN_BACKGROUND_COLOR)) {
Platform.runLater(() -> {
design.setBackgroundColor(color);
pad.getPadSettings().setCustomDesign(true);
mainViewController.loadUserCss();
});
} else if (field.equals(PropertyDef.DESIGN_PLAY_COLOR)) {
Platform.runLater(() -> {
design.setPlayColor(color);
pad.getPadSettings().setCustomDesign(true);
mainViewController.loadUserCss();
});
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment