From e4ebe82049c60aebc4ede85e9444de711face434 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Thu, 22 Sep 2016 21:53:47 +0200
Subject: [PATCH] Fixed CartDesign Bug
---
.../tobias/playpad/design/classic/ClassicGlobalDesign.java | 2 +-
.../de/tobias/playpad/design/modern/ModernGlobalDesign.java | 2 +-
.../de/tobias/playpad/layout/desktop/DesktopPadView.java | 5 +++--
.../playpad/layout/desktop/DesktopPadViewController.java | 4 ++--
.../src/de/tobias/playpad/layout/touch/TouchPadView.java | 3 ++-
.../tobias/playpad/layout/touch/TouchPadViewController.java | 6 ++----
PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java | 6 +++++-
.../src/de/tobias/playpad/project/page/PadIndex.java | 2 +-
8 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java b/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
index 76d1ecb4..07f9abf3 100644
--- a/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
+++ b/PlayWall/src/de/tobias/playpad/design/classic/ClassicGlobalDesign.java
@@ -329,7 +329,7 @@ public class ClassicGlobalDesign extends Design implements GlobalDesign {
if (padSettings.isCustomLayout()) {
CartDesign layoutOpt = padSettings.getLayout();
- css += "\n" + layoutOpt.convertToCss(String.valueOf(pad.getIndex()), true);
+ css += "\n" + layoutOpt.convertToCss(pad.getPadIndex().toString(), true);
}
}
diff --git a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
index 08f9fa17..bdb959e9 100644
--- a/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
+++ b/PlayWall/src/de/tobias/playpad/design/modern/ModernGlobalDesign.java
@@ -200,7 +200,7 @@ public class ModernGlobalDesign extends Design implements GlobalDesign, DesignCo
if (padSettings.isCustomLayout()) {
CartDesign layoutOpt = padSettings.getLayout(Profile.currentProfile().getProfileSettings().getLayoutType());
- css += "\n" + layoutOpt.convertToCss(String.valueOf(pad.getIndex()), true);
+ css += "\n" + layoutOpt.convertToCss(pad.getPadIndex().toString(), true);
}
}
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
index 72d74d98..9a4553e8 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
@@ -10,6 +10,7 @@ import de.tobias.playpad.pad.conntent.play.Pauseable;
import de.tobias.playpad.pad.view.IPadContentView;
import de.tobias.playpad.pad.view.IPadView;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.view.EmptyPadView;
import de.tobias.utils.ui.icon.FontAwesomeType;
@@ -301,7 +302,7 @@ public class DesktopPadView implements IPadView {
}
@Override
- public void applyStyleClasses(int index) {
+ public void applyStyleClasses(PadIndex index) {
superRoot.getStyleClass().addAll("pad", "pad" + index);
indexLabel.getStyleClass().addAll("pad-index", "pad" + index + "-index", "pad-info", "pad" + index + "-info");
@@ -333,7 +334,7 @@ public class DesktopPadView implements IPadView {
@Override
public void removeStyleClasses() {
Pad pad = getViewController().getPad();
- int index = pad.getIndex();
+ PadIndex index = pad.getPadIndex();
superRoot.getStyleClass().removeAll("pad", "pad" + index);
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
index 0384a296..1b14efa6 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadViewController.java
@@ -114,7 +114,7 @@ public class DesktopPadViewController implements IPadViewController, EventHandle
e.printStackTrace();
}
- padView.applyStyleClasses(pad.getIndex());
+ padView.applyStyleClasses(pad.getPadIndex());
padView.setContentView(pad);
}
@@ -269,7 +269,7 @@ public class DesktopPadViewController implements IPadViewController, EventHandle
}
Stage owner = mvc.getStage();
-
+
PadSettingsViewController padSettingsViewController = new PadSettingsViewController(pad, owner);
padSettingsViewController.getStage().setOnHiding(ev ->
{
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
index 4e23c6ac..ac2e99fa 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadView.java
@@ -8,6 +8,7 @@ import de.tobias.playpad.pad.conntent.PadContentConnect;
import de.tobias.playpad.pad.view.IPadContentView;
import de.tobias.playpad.pad.view.IPadView;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import de.tobias.playpad.registry.NoSuchComponentException;
import de.tobias.playpad.view.EmptyPadView;
import de.tobias.utils.ui.icon.FontAwesomeType;
@@ -231,7 +232,7 @@ public class TouchPadView implements IPadView {
}
@Override
- public void applyStyleClasses(int index) {
+ public void applyStyleClasses(PadIndex index) {
superRoot.getStyleClass().addAll("pad", "pad" + index);
indexLabel.getStyleClass().addAll("pad-index", "pad" + index + "-index", "pad-info", "pad" + index + "-info");
diff --git a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
index 11ef9044..38c35cca 100644
--- a/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
+++ b/PlayWall/src/de/tobias/playpad/layout/touch/TouchPadViewController.java
@@ -87,9 +87,7 @@ public class TouchPadViewController implements IPadViewController, EventHandler<
pad.statusProperty().addListener(padStatusListener);
// First Listener call with new data
- padContentListener.changed(null, null, pad.getContent()); // Add
- // Duration
- // listener
+ padContentListener.changed(null, null, pad.getContent()); // Add Duration listener
padStatusListener.changed(null, null, pad.getStatus());
padDragListener = new PadDragListener(pad, padView);
@@ -97,7 +95,7 @@ public class TouchPadViewController implements IPadViewController, EventHandler<
e.printStackTrace();
}
- padView.applyStyleClasses(pad.getIndex());
+ padView.applyStyleClasses(pad.getPadIndex());
padView.setContentView(pad);
}
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
index 67c3ce99..8cda8936 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadView.java
@@ -2,6 +2,7 @@ package de.tobias.playpad.pad.view;
import de.tobias.playpad.pad.Pad;
import de.tobias.playpad.pad.viewcontroller.IPadViewController;
+import de.tobias.playpad.project.page.PadIndex;
import javafx.css.PseudoClass;
import javafx.scene.layout.Pane;
@@ -120,8 +121,11 @@ public interface IPadView {
/**
* Fügt die StyleClasses der PadView hinzu. Die Methode wird vom Controller aufgerufen.
+ *
+ * @param index
+ * Index von der Kachel
*/
- public void applyStyleClasses(int index);
+ public void applyStyleClasses(PadIndex index);
/**
* Entfernt die StyleClasses vom PadView. Die Methode wird vom Controller aufgerufen.
diff --git a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java b/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
index 11067fee..d8e3e6fd 100644
--- a/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
+++ b/PlayWallCore/src/de/tobias/playpad/project/page/PadIndex.java
@@ -56,7 +56,7 @@ public class PadIndex implements Serializable {
@Override
public String toString() {
- return "PadIndex [id=" + id + ", page=" + page + "]";
+ return id + "-" + page;
}
}
--
GitLab