From 4287c6a5c26c7fafa8b6c477f4fc45a5bf19874f Mon Sep 17 00:00:00 2001 From: Jafea7 Date: Mon, 7 Apr 2025 15:16:48 +1000 Subject: [PATCH] Remove Live Previews --- .../main/java/ctbrec/ui/tabs/ThumbCell.java | 74 +------------------ 1 file changed, 4 insertions(+), 70 deletions(-) diff --git a/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java b/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java index bfa78af9..3a662939 100644 --- a/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java +++ b/client/src/main/java/ctbrec/ui/tabs/ThumbCell.java @@ -42,7 +42,6 @@ import javafx.scene.layout.StackPane; import javafx.scene.paint.Color; import javafx.scene.paint.Paint; import javafx.scene.shape.Circle; -import javafx.scene.shape.Polygon; import javafx.scene.shape.Rectangle; import javafx.scene.shape.Shape; import javafx.scene.text.Text; @@ -97,7 +96,6 @@ public class ThumbCell extends StackPane { private final Recorder recorder; private final RecordingIndicator recordingIndicator; private final Tooltip recordingIndicatorTooltip; - private StackPane previewTrigger; private final StackPane groupIndicator; private final Label groupIndicatorTooltipTrigger; private int index = 0; @@ -116,7 +114,6 @@ public class ThumbCell extends StackPane { .maximumSize(10000) .build(CacheLoader.from(ThumbCell::getStreamResolution)); private final ThumbOverviewTab parent; - private CompletableFuture startPreview; public ThumbCell(ThumbOverviewTab parent, Model model, Recorder recorder, double aspectRatio) { this.parent = parent; @@ -259,6 +256,7 @@ public class ThumbCell extends StackPane { case RECORDING -> pauseResumeAction(true); case PAUSED -> pauseResumeAction(false); case BOOKMARKED -> forgetModel(); + case NOT -> handleNotState(); } } @@ -268,74 +266,10 @@ public class ThumbCell extends StackPane { .thenAccept(r -> update()); } - private Node createPreviewTrigger() { - var s = 24; - previewTrigger = new StackPane(); - previewTrigger.setStyle("-fx-background-color: white;"); - previewTrigger.setOpacity(.8); - previewTrigger.setMaxSize(s, s); - - var play = new Polygon(16, 8, 26, 15, 16, 22); - StackPane.setMargin(play, new Insets(0, 0, 0, 3)); - play.setStyle("-fx-background-color: black;"); - previewTrigger.getChildren().add(play); - - var clip = new Circle(s / 2.0); - clip.setTranslateX(clip.getRadius()); - clip.setTranslateY(clip.getRadius()); - previewTrigger.setClip(clip); - StackPane.setAlignment(previewTrigger, Pos.BOTTOM_LEFT); - StackPane.setMargin(previewTrigger, new Insets(0, 0, 24, 4)); - previewTrigger.setOnMouseEntered(evt -> startPreview()); - previewTrigger.setOnMouseExited(evt -> stopPreview()); - return previewTrigger; + private void handleNotState() { + // Implement the logic for when the recording state is NOT } - - private void stopPreview() { - if (startPreview != null) { - startPreview.cancel(true); - } - setPreviewVisible(previewTrigger, false); - } - - private void startPreview() { - previewTrigger.setCursor(Cursor.HAND); - startPreview = CompletableFuture.supplyAsync(() -> { - try { - Thread.sleep(500); - return true; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - return false; - } - }, GlobalThreadPool.get()).whenComplete((result, exception) -> { - startPreview = null; - if (Boolean.TRUE.equals(result)) { - setPreviewVisible(previewTrigger, true); - } - }); - } - - private void setPreviewVisible(Node previewTrigger, boolean visible) { - parent.suspendUpdates(visible); - iv.setVisible(!visible); - topic.setVisible(!visible); - topicBackground.setVisible(!visible); - name.setVisible(!visible); - nameBackground.setVisible(!visible); - streamPreview.setVisible(visible); - if (visible) { - streamPreview.startStream(model); - } else { - streamPreview.stop(); - } - recordingIndicator.setVisible(!visible); - if (!visible) { - updateRecordingIndicator(); - } - previewTrigger.setCursor(visible ? Cursor.HAND : Cursor.DEFAULT); - } - + public void setSelected(boolean selected) { selectionProperty.set(selected); selectionOverlay.setOpacity(selected ? .75 : 0);