Skip to content

Fixes OutputSockets preview button toggled wrong #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 15, 2016
Merged

Fixes OutputSockets preview button toggled wrong #361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions ui/src/main/java/edu/wpi/grip/ui/pipeline/OutputSocketController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
package edu.wpi.grip.ui.pipeline;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import com.google.inject.assistedinject.Assisted;
import edu.wpi.grip.core.OutputSocket;
import edu.wpi.grip.core.Socket;
import edu.wpi.grip.core.SocketHint;
import edu.wpi.grip.core.events.SocketPreviewChangedEvent;
import edu.wpi.grip.ui.Controller;
import edu.wpi.grip.ui.annotations.ParametrizedController;
import javafx.beans.InvalidationListener;
import javafx.fxml.FXML;
import javafx.scene.Node;
import javafx.scene.control.Label;
Expand Down Expand Up @@ -40,7 +43,8 @@ public class OutputSocketController implements Controller {
@FXML
private StackPane handlePane;

private SocketHandleView.Factory socketHandleFactory;
private final SocketHandleView.Factory socketHandleFactory;
private final InvalidationListener previewListener;

/**
* The "handle" is a simple shape next ot the socket identifier that shows whether or not there is a connection
Expand All @@ -59,6 +63,7 @@ public interface Factory {
OutputSocketController(SocketHandleView.Factory socketHandleFactory, @Assisted OutputSocket socket) {
this.socketHandleFactory = checkNotNull(socketHandleFactory, "Socket Handle factory can not be null");
this.socket = checkNotNull(socket, "The output socket can not be null");
this.previewListener = value -> this.socket.setPreviewed(this.preview.isSelected());
}

@FXML
Expand All @@ -70,7 +75,7 @@ public void initialize() {

// Show a button to choose if we want to preview the socket or not
this.preview.setSelected(this.socket.isPreviewed());
this.preview.selectedProperty().addListener(value -> this.socket.setPreviewed(this.preview.isSelected()));
this.preview.selectedProperty().addListener(previewListener);

SocketHint<?> socketHint = this.socket.getSocketHint();

Expand All @@ -87,6 +92,19 @@ public SocketHandleView getHandle() {
return this.handle;
}

@Subscribe
public void onSocketPreviewChangedEvent(SocketPreviewChangedEvent event) {
if (event.getSocket().equals(socket)) {
// Only try to update the button if the two aren't the same
// This really should only happen we deserialize the pipeline
if (event.getSocket().isPreviewed() != preview.isSelected()) {
preview.selectedProperty().removeListener(previewListener);
preview.setSelected(event.getSocket().isPreviewed());
preview.selectedProperty().addListener(previewListener);
}
}
}

@VisibleForTesting
ToggleButton previewButton() {
return preview;
Expand Down