diff --git a/pom.xml b/pom.xml
index d9c15d8..c4cd086 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
org.xerial
sqlite-jdbc
- 3.31.1
+ 3.32.3.1
diff --git a/src/main/java/org/mosad/homeflix/player/PlayerController.java b/src/main/java/org/mosad/homeflix/player/PlayerController.java
index 8794849..3da3e71 100644
--- a/src/main/java/org/mosad/homeflix/player/PlayerController.java
+++ b/src/main/java/org/mosad/homeflix/player/PlayerController.java
@@ -228,6 +228,9 @@ public class PlayerController {
player.getStage().setFullScreen(!player.getStage().isFullScreen());
fullscreenIcon.setImage(player.getStage().isFullScreen() ? fullscreenExit : fullscreen);
}
+
+ // fix focused button has rippler fill https://github.com/jfoenixadmin/JFoenix/issues/1051
+ btnBack.setStyle("-jfx-rippler-fill: black;");
}
/**
@@ -289,13 +292,15 @@ public class PlayerController {
public void handle(MouseEvent event) {
embeddedMediaPlayer.controls().skipTime(skipTime);
- // TODO update time-stamps if video is paused
-// currentTime = currentTime + skipTime;
-// endTime = endTime - skipTime;
-//
-// Platform.runLater(() -> {
-// updateControls();
-// });
+ // update time-stamps if video is paused
+ if (!embeddedMediaPlayer.status().isPlaying()) {
+ Platform.runLater(() -> {
+ lblEndTime.setText(String.format("%d:%02d:%02d",
+ TimeUnit.MILLISECONDS.toHours(endTime - skipTime) % 24,
+ TimeUnit.MILLISECONDS.toMinutes(endTime - skipTime) % 60,
+ TimeUnit.MILLISECONDS.toSeconds(endTime - skipTime) % 60));
+ });
+ }
mousePressed = false;
}
@@ -428,12 +433,30 @@ public class PlayerController {
@FXML
void btnReplayAction(ActionEvent event) {
- embeddedMediaPlayer.controls().skipTime(-10000);
+ embeddedMediaPlayer.controls().skipTime(-10000);
+
+ if (!embeddedMediaPlayer.status().isPlaying()) {
+ currentTime = currentTime - 10000;
+ endTime = endTime + 10000;
+
+ Platform.runLater(() -> {
+ updateControls();
+ });
+ }
}
@FXML
void btnForwardAction(ActionEvent event) {
- embeddedMediaPlayer.controls().skipTime(10000);
+ embeddedMediaPlayer.controls().skipTime(10000);
+
+ if (!embeddedMediaPlayer.status().isPlaying()) {
+ currentTime = currentTime + 10000;
+ endTime = endTime - 10000;
+
+ Platform.runLater(() -> {
+ updateControls();
+ });
+ }
}
@FXML
@@ -547,7 +570,4 @@ public class PlayerController {
Platform.runLater(() -> videoPixelBuffer.updateBuffer(pb -> null));
}
}
-
-
-
}
diff --git a/src/main/resources/css/Player.css b/src/main/resources/css/Player.css
index a44f124..02c1ee7 100644
--- a/src/main/resources/css/Player.css
+++ b/src/main/resources/css/Player.css
@@ -76,3 +76,15 @@
.jfx-popup-container {
-fx-background-color: -theme-secondary-dark;
}
+
+/*******************************************************************************
+ * *
+ * Button *
+ * *
+ ******************************************************************************/
+
+.jfx-button:hover {
+ -fx-scale-x: 1.1;
+ -fx-scale-y: 1.1;
+ -fx-scale-z: 1.1;
+}
diff --git a/src/main/resources/fxml/PlayerWindow.fxml b/src/main/resources/fxml/PlayerWindow.fxml
index 0a6996e..f518955 100644
--- a/src/main/resources/fxml/PlayerWindow.fxml
+++ b/src/main/resources/fxml/PlayerWindow.fxml
@@ -22,7 +22,7 @@
-
+
@@ -31,7 +31,7 @@