From 711d56716f4f888a8bbfe6a45f22dcad6287f6dd Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Thu, 8 Sep 2016 12:17:56 +0200
Subject: [PATCH] Fixed pseudoclasses for AudioContentView
---
.../layout/desktop/DesktopPadView.java | 2 ++
.../playpad/pad/content/AudioContentView.java | 8 +++++++-
.../playpad/pad/view/IPadContentView.java | 19 +++++++++++++------
.../image/ImageContentConntect.java | 2 +-
.../video/VideoContentConntect.java | 2 +-
5 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
index 72d74d98..80b2dc97 100644
--- a/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
+++ b/PlayWall/src/de/tobias/playpad/layout/desktop/DesktopPadView.java
@@ -206,6 +206,8 @@ public class DesktopPadView implements IPadView {
if (preview != null) {
preview.getChildren().forEach(i -> i.pseudoClassStateChanged(pseudoClass, active));
+ if (previewContent != null)
+ previewContent.pseudoClassStateChanged(pseudoClass, active);
}
playBar.pseudoClassStateChanged(pseudoClass, active);
diff --git a/PlayWall/src/de/tobias/playpad/pad/content/AudioContentView.java b/PlayWall/src/de/tobias/playpad/pad/content/AudioContentView.java
index 6442edb2..75c4f848 100644
--- a/PlayWall/src/de/tobias/playpad/pad/content/AudioContentView.java
+++ b/PlayWall/src/de/tobias/playpad/pad/content/AudioContentView.java
@@ -8,6 +8,7 @@ import de.tobias.playpad.settings.PeakType;
import de.tobias.playpad.settings.Profile;
import de.tobias.playpad.settings.ProfileSettings;
import javafx.collections.ListChangeListener;
+import javafx.css.PseudoClass;
import javafx.geometry.Pos;
import javafx.scene.Node;
import javafx.scene.control.Label;
@@ -70,7 +71,12 @@ class AudioContentView implements IPadContentView {
}
@Override
- public void unconnect() {
+ public void pseudoClassStateChanged(PseudoClass pseudoClass, boolean active) {
+ nameLabel.pseudoClassStateChanged(pseudoClass, active);
+ }
+
+ @Override
+ public void deinit() {
nameLabel.textProperty().unbind();
}
}
\ No newline at end of file
diff --git a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java
index d2cc6821..35372ebb 100644
--- a/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java
+++ b/PlayWallCore/src/de/tobias/playpad/pad/view/IPadContentView.java
@@ -1,5 +1,6 @@
package de.tobias.playpad.pad.view;
+import javafx.css.PseudoClass;
import javafx.scene.Node;
// TODO Rename to ContentView
@@ -19,14 +20,20 @@ public interface IPadContentView {
*/
public Node getNode();
- @Deprecated
- public void unconnect();
+ /**
+ * Setzt Psuedoclasses. (Optional)
+ *
+ * @param pseudoClass
+ * pseudoclass
+ * @param active
+ * active
+ */
+ public default void pseudoClassStateChanged(PseudoClass pseudoClass, boolean active) {
+
+ }
/**
* Deinitialisiert die View. Hier können mögliche Bindings und Listener entfernt werden.
*/
- public default void deinit() {
- // TODO Remove the default after remove unconnect from interface
- unconnect();
- }
+ public void deinit();
}
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
index 53e049cd..fabd24a8 100644
--- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
+++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/image/ImageContentConntect.java
@@ -119,7 +119,7 @@ public class ImageContentConntect extends PadContentConnect {
}
@Override
- public void unconnect() {
+ public void deinit() {
nameLabel.textProperty().unbind();
}
diff --git a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
index 4fd611c0..394e41c6 100644
--- a/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
+++ b/PlayWallPlugins/mediaplugin/de/tobias/playpad/mediaplugin/video/VideoContentConntect.java
@@ -87,7 +87,7 @@ public class VideoContentConntect extends PadContentConnect {
}
@Override
- public void unconnect() {
+ public void deinit() {
nameLabel.textProperty().unbind();
}
}
--
GitLab