Merge pull request #455 from ThomasJClark/warning-icon

Fix warning icon

Author: JLLeitschuh

ui/src/main/java/edu/wpi/grip/ui/components/ExceptionWitnessResponderButton.java

@@ -8,15 +8,14 @@
 import edu.wpi.grip.core.events.ExceptionClearedEvent;
 import edu.wpi.grip.core.events.ExceptionEvent;
 import edu.wpi.grip.ui.util.DPIUtility;
-import javafx.animation.FadeTransition;
-import javafx.animation.Timeline;
+import javafx.animation.*;
 import javafx.application.Platform;
 import javafx.geometry.HPos;
 import javafx.geometry.Insets;
 import javafx.geometry.VPos;
-import javafx.scene.Node;
 import javafx.scene.Parent;
 import javafx.scene.control.*;
+import javafx.scene.image.ImageView;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.Priority;
 import javafx.scene.paint.Color;
@@ -25,16 +24,13 @@
 import javafx.util.Duration;
 import org.apache.commons.lang3.text.WordUtils;
 import org.controlsfx.control.PopOver;
-import org.controlsfx.glyphfont.FontAwesome;
-import org.controlsfx.glyphfont.Glyph;
 
 import java.util.Optional;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
  * Listens and responds to events posted by the {@link edu.wpi.grip.core.util.ExceptionWitness}
- *
  */
 public final class ExceptionWitnessResponderButton extends Button {
     @VisibleForTesting
@@ -64,11 +60,13 @@ protected static class ExceptionPopOver extends PopOver {
 
         private ExceptionPopOver(String title) {
             super();
+
             setTitle(title);
             stackTrace.setEditable(false);
 
             getStyleClass().add(this.STYLE_CLASS);
             setHeaderAlwaysVisible(true);
+            setDetachable(false);
 
             GridPane.setHalignment(errorMessage, HPos.CENTER);
             GridPane.setValignment(errorMessage, VPos.CENTER);
@@ -98,6 +96,7 @@ private ExceptionPopOver(String title) {
 
         /**
          * Assigns the contents of the popover using the data from the exception event.
+         *
          * @param event The event that this popover should display.
          */
         private void assignFromExceptionEvent(ExceptionEvent event) {
@@ -127,22 +126,33 @@ private void assignFromExceptionEvent(ExceptionEvent event) {
      */
     @Inject
     ExceptionWitnessResponderButton(@Assisted Object origin, @Assisted String popOverTitle) {
-        super(null, addFadeTransition(
-                new Glyph("FontAwesome", FontAwesome.Glyph.EXCLAMATION_TRIANGLE)
-                        .color(Color.RED).size(DPIUtility.MINI_ICON_SIZE)));
+        super();
+
         this.origin = checkNotNull(origin, "The origin can not be null");
         this.popOverTitle = checkNotNull(popOverTitle, "The pop over title can not be null");
         this.tooltip = new Tooltip();
         this.getStyleClass().add(STYLE_CLASS);
 
-        this.setOnAction(event -> getPopover().show(this));
+        ImageView icon = new ImageView("/edu/wpi/grip/ui/icons/warning.png");
 
-        this.setVisible(false);
+        setOnMouseClicked(event -> getPopover().show(this));
+        setVisible(false);
+        setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
+        setGraphic(icon);
+        icon.setFitWidth(DPIUtility.SMALL_ICON_SIZE);
+        icon.setFitHeight(DPIUtility.SMALL_ICON_SIZE);
+
+        FadeTransition ft = new FadeTransition(Duration.millis(750), icon);
+        ft.setToValue(0.1);
+        ft.setCycleCount(Transition.INDEFINITE);
+        ft.setAutoReverse(true);
+        ft.play();
     }
 
     /**
      * If the popover hasn't been created before then this creates the popover.
      * Otherwise it returns the popover that was constructed the first time this method was run.
+     *
      * @return The popover for this button
      */
     private synchronized ExceptionPopOver getPopover() {
@@ -165,8 +175,6 @@ public void onExceptionEvent(ExceptionEvent event) {
             Platform.runLater(() -> {
                 // Update the text of the tooltip to this event
                 tooltip.setText(WordUtils.wrap(event.getMessage(), 90, null, true));
-                // The tooltip is removed when the exception is cleared
-                setTooltip(tooltip);
 
                 getPopover().assignFromExceptionEvent(event);
                 this.setVisible(true);
@@ -181,23 +189,7 @@ public void onExceptionClearedEvent(ExceptionClearedEvent event) {
             Platform.runLater(() -> {
                 getPopover().hide();
                 setVisible(false);
-                setTooltip(null);
             });
         }
     }
-
-    /**
-     * Creates a fade transition on a node.
-     * @param node The node to add the transition too.
-     * @return The node that the transition is now applied to.
-     */
-    private static Node addFadeTransition(Node node) {
-        FadeTransition ft = new FadeTransition(Duration.millis(750), node);
-        ft.setFromValue(1.0);
-        ft.setToValue(0.1);
-        ft.setCycleCount(Timeline.INDEFINITE);
-        ft.setAutoReverse(true);
-        ft.play();
-        return node;
-    }
 }

ui/src/main/resources/edu/wpi/grip/ui/GRIP.css

@@ -106,10 +106,12 @@ Button.add-source {
     -fx-spacing: 0.5em;
 }
 
-Button.delete, Button.move-left, Button.move-right, start-stoppable-button {
+Button.delete, Button.move-left, Button.move-right, .start-stoppable-button, .exception-witness-responder-button {
     -fx-padding: 0.2em 0.8em;
     -fx-font-weight: bold;
     -fx-text-fill: -fx-dark-color;
+    -fx-pref-height: 2em;
+    -fx-pref-width: 2em;
 }
 
 VBox.sockets {
@@ -177,6 +179,10 @@ VBox.sockets {
     -fx-fill: none;
 }
 
+.error-pop-over {
+    -fx-padding: 0.5em;
+}
+
 .error-pop-over .titled-pane > .title {
     -fx-border-color: lightgrey;
     -fx-border-insets: 5 5 5 5;

ui/src/main/resources/edu/wpi/grip/ui/icons/warning.png

@@ -15,15 +15,21 @@
             </tooltip>
         </Button>
         <Pane HBox.hgrow="ALWAYS"/>
-        <HBox fx:id="buttons" >
+        <HBox fx:id="buttons">
             <Button fx:id="moveLeftButton" onMouseClicked="#moveStepLeft" styleClass="move-left"
                     text="◀" HBox.hgrow="NEVER">
+                <minHeight>
+                    <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                </minHeight>
                 <tooltip>
                     <Tooltip text="Move Step Left"/>
                 </tooltip>
             </Button>
             <Button fx:id="moveRightButton" onMouseClicked="#moveStepRight" styleClass="move-right"
                     text="▶" HBox.hgrow="NEVER">
+                <minHeight>
+                    <DPIUtility fx:constant="SMALL_ICON_SIZE"/>
+                </minHeight>
                 <tooltip>
                     <Tooltip text="Move Step Right"/>
                 </tooltip>