diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java index 5649427cc95ccc565a1754c26337e5f9affbf37e..137d20bb6cfa6f92dd108741cfdce2878bc7d41b 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java +++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadView.java @@ -30,6 +30,7 @@ import javafx.beans.property.Property; import javafx.css.PseudoClass; import javafx.geometry.Pos; import javafx.scene.Node; +import javafx.scene.Parent; import javafx.scene.control.Button; import javafx.scene.control.Label; import javafx.scene.control.ProgressBar; @@ -151,11 +152,11 @@ public class DesktopPadView implements IPadView { PadContentFactory connect = registry.getFactory(content.getType()); previewContent = connect.getPadContentPreview(pad, preview); - Node node = previewContent.getNode(); + Parent node = previewContent.getNode(); - // Copy Pseudoclasses + // Copy Pseudo classes for (PseudoClass pseudoClass : superRoot.getPseudoClassStates()) { - node.pseudoClassStateChanged(pseudoClass, true); + NodeWalker.getAllNodes(node).forEach(element -> element.pseudoClassStateChanged(pseudoClass, true)); } preview.getChildren().setAll(node); diff --git a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java index 631b98730cf0002aee6a39c6b87d708bc06f6d8c..9ca4d6625e8a5e0f9864d1710118b5de97a74818 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/layout/desktop/pad/DesktopPadViewController.java @@ -110,7 +110,7 @@ public class DesktopPadViewController implements IPadViewController, EventHandle // Initial Listener call with new data padContentListener.changed(null, null, pad.getContent()); // Add Duration listener - padStatusListener.changed(null, null, pad.getStatus()); + padStatusListener.changed(null, null, pad.getStatus()); // Show correct pseudo classes ... // Add Drag and Drop Listener padDragListener = new DesktopPadDragListener(pad, padView, connect); diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/preview/PadTextPreview.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/preview/PadTextPreview.java index c197d2fea6e76d1385978d57f3bc490d1291c07d..714792cb845c075ea42c739964af5f1b44ef8fa7 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/preview/PadTextPreview.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/preview/PadTextPreview.java @@ -3,7 +3,7 @@ package de.tobias.playpad.pad.preview; import de.tobias.playpad.pad.Pad; import de.tobias.playpad.pad.view.IPadContentView; import javafx.geometry.Pos; -import javafx.scene.Node; +import javafx.scene.Parent; import javafx.scene.control.Label; import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; @@ -29,7 +29,7 @@ public class PadTextPreview implements IPadContentView { } @Override - public Node getNode() { + public Parent getNode() { return nameLabel; } diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java b/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java index c91aa9c7651afdc804ed1e961bf8cf80a1744338..62c5c08f19d5f9dfae5feddd12b5020c1a0e4be6 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/pad/view/IPadContentView.java @@ -1,6 +1,6 @@ package de.tobias.playpad.pad.view; -import javafx.scene.Node; +import javafx.scene.Parent; // TODO Rename to ContentView @@ -17,7 +17,7 @@ public interface IPadContentView { * * @return GUI Element */ - Node getNode(); + Parent getNode(); /** * Deinitialisiert die View. Hier können mögliche Bindings und Listener entfernt werden. diff --git a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadPreview.scala b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadPreview.scala index 1b5b96dcfcc9293bda8b7bde021d845db62937de..6ff298194c1ec57c2f6e7262b8c1c96db6498476 100644 --- a/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadPreview.scala +++ b/PlayWallPlugins/PlayWallPluginContentPlayer/src/main/scala/de/tobias/playpad/plugin/content/pad/ContentPlayerPadPreview.scala @@ -6,7 +6,7 @@ import de.tobias.playpad.pad.view.IPadContentView import javafx.beans.binding.Bindings import javafx.collections.ListChangeListener import javafx.geometry.{Insets, Pos} -import javafx.scene.Node +import javafx.scene.Parent import javafx.scene.control.Label import javafx.scene.layout.{Pane, Priority, VBox} import javafx.scene.text.TextAlignment @@ -59,7 +59,7 @@ class ContentPlayerPadPreview(pad: Pad, parent: Pane) extends VBox with IPadCont VBox.setVgrow(label, Priority.ALWAYS) } - override def getNode: Node = this + override def getNode: Parent = this override def deInit(): Unit = { nameLabel.textProperty().unbind() diff --git a/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java index 4a9a5ec7b072aa401cb87eea1093050a199b6539..d9c10d492f3725b1bd743b09aab267bfe581046f 100644 --- a/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java +++ b/PlayWallPlugins/PlayWallPluginMedia/src/main/java/de/tobias/playpad/plugin/media/image/ImagePadContentFactory.java @@ -9,7 +9,7 @@ import javafx.collections.ListChangeListener; import javafx.collections.SetChangeListener; import javafx.css.PseudoClass; import javafx.geometry.Pos; -import javafx.scene.Node; +import javafx.scene.Parent; import javafx.scene.control.Label; import javafx.scene.layout.Pane; import javafx.scene.layout.Priority; @@ -91,7 +91,7 @@ public class ImagePadContentFactory extends PadContentFactory { } @Override - public Node getNode() { + public Parent getNode() { return stackPane; }