davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Fix pause indicator click area

This commit is contained in:
0xb00bface 2020-11-22 00:19:32 +01:00
parent 678d7b0174
commit 4bdb7f5c21
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/main/java/ctbrec/ui/controls/PausedIndicator.java
View File

@ -1,8 +1,6 @@
package ctbrec.ui.controls; package ctbrec.ui.controls;
import ctbrec.ui.PauseIcon; import ctbrec.ui.PauseIcon;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.Cursor; import javafx.scene.Cursor;
import javafx.scene.layout.StackPane; import javafx.scene.layout.StackPane;
import javafx.scene.paint.Color; import javafx.scene.paint.Color;
@ -15,6 +13,8 @@ public class PausedIndicator extends StackPane {
private Rectangle clickPanel; private Rectangle clickPanel;
public PausedIndicator(int size, Color color) { public PausedIndicator(int size, Color color) {
setMaxSize(size, size);
pausedIcon = new PauseIcon(color, size); pausedIcon = new PauseIcon(color, size);
pausedIcon.setVisible(false); pausedIcon.setVisible(false);
clickPanel = new Rectangle(size, size); clickPanel = new Rectangle(size, size);
@ -23,13 +23,7 @@ public class PausedIndicator extends StackPane {
getChildren().add(pausedIcon); getChildren().add(pausedIcon);
getChildren().add(clickPanel); getChildren().add(clickPanel);
StackPane.setMargin(pausedIcon, new Insets(3));
StackPane.setAlignment(pausedIcon, Pos.TOP_LEFT);
StackPane.setMargin(clickPanel, new Insets(3));
StackPane.setAlignment(clickPanel, Pos.TOP_LEFT);
pausedIcon.visibleProperty().bindBidirectional(visibleProperty()); pausedIcon.visibleProperty().bindBidirectional(visibleProperty());
pausedIcon.onMouseClickedProperty().bindBidirectional(onMouseClickedProperty());
clickPanel.onMouseClickedProperty().bindBidirectional(onMouseClickedProperty()); clickPanel.onMouseClickedProperty().bindBidirectional(onMouseClickedProperty());
} }
} }

31
client/src/main/java/ctbrec/ui/tabs/ThumbCell.java
View File

@ -1,25 +1,8 @@
package ctbrec.ui.tabs; package ctbrec.ui.tabs;
import static ctbrec.Model.State.*;
import static ctbrec.io.HttpConstants.*;
import java.io.IOException;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.cache.CacheBuilder; import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader; import com.google.common.cache.CacheLoader;
import com.google.common.cache.LoadingCache; import com.google.common.cache.LoadingCache;
import ctbrec.Config; import ctbrec.Config;
import ctbrec.Model; import ctbrec.Model;
import ctbrec.Model.State; import ctbrec.Model.State;
@ -63,6 +46,18 @@ import javafx.scene.text.TextAlignment;
import javafx.util.Duration; import javafx.util.Duration;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.Response; import okhttp3.Response;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.Locale;
import java.util.Objects;
import java.util.concurrent.*;
import java.util.function.Function;
import static ctbrec.Model.State.OFFLINE;
import static ctbrec.Model.State.ONLINE;
import static ctbrec.io.HttpConstants.*;
public class ThumbCell extends StackPane { public class ThumbCell extends StackPane {
@ -185,6 +180,8 @@ public class ThumbCell extends StackPane {
pausedIndicator = new PausedIndicator(16, colorRecording); pausedIndicator = new PausedIndicator(16, colorRecording);
pausedIndicator.setOnMouseClicked(e -> pauseResumeAction(false)); pausedIndicator.setOnMouseClicked(e -> pauseResumeAction(false));
StackPane.setMargin(pausedIndicator, new Insets(3));
StackPane.setAlignment(pausedIndicator, Pos.TOP_LEFT);
getChildren().add(pausedIndicator); getChildren().add(pausedIndicator);
if (Config.getInstance().getSettings().livePreviews) { if (Config.getInstance().getSettings().livePreviews) {