Changeset 892

Timestamp:

02/14/14 12:12:52 (10 years ago)

Author:

ngw8

Message:

Added a status bar to the jfx browser that shows up when a link is hovered over

Location:

trunk/src/org/expeditee

Files:

• assets/style/jfx.css (modified) (1 diff)
• items/widgets/JfxBrowser.java (modified) (9 diffs)

trunk/src/org/expeditee/assets/style/jfx.css

@@ -79 +79 @@
 }
 
+.browser-status-label {
+    -fx-background-color: derive(-fx-base, -16%), linear-gradient(to bottom, derive(-fx-base, 2%), derive(-fx-base, -8%));
+    -fx-background-insets: 0, 1 1 0 0;
+    -fx-padding: 4 8 4 8;
+    -fx-background-radius: 0 2 0 0;
+}
+
 .fa {
     -fx-font-family: FontAwesome;   

trunk/src/org/expeditee/items/widgets/JfxBrowser.java

@@ -15 +15 @@
 import java.lang.reflect.Field;
 
+import javafx.animation.FadeTransition;
 import javafx.application.Platform;
 import javafx.beans.value.ChangeListener;
@@ -50 +51 @@
 import javafx.scene.text.Font;
 import javafx.scene.web.WebEngine;
+import javafx.scene.web.WebEvent;
 import javafx.scene.web.WebView;
+import javafx.util.Duration;
 import netscape.javascript.JSObject;
 
@@ -94 +97 @@
         private Button _convertButton;
         private ToggleButton _readableModeButton;
+        private Label _statusLabel;
+        private FadeTransition _statusFadeIn;
+        private FadeTransition _statusFadeOut;
 
         private TextField _urlField;
@@ -117 +123 @@
         }
         }
-        
-        private Point getCoordFromCaret(TextField text) {
-                TextFieldSkin skin = (TextFieldSkin) text.getSkin();
-                
-                Point2D onScene = text.localToScene(0, 0);
-                
-                double x = onScene.getX() + JfxBrowser.this.getX();// - org.expeditee.gui.Browser._theBrowser.getOrigin().x;
-                double y = onScene.getY() + JfxBrowser.this.getY();// - org.expeditee.gui.Browser._theBrowser.getOrigin().y;
-                
-                Rectangle2D cp = skin.getCharacterBounds(text.getCaretPosition());
-                
-                return new Point((int) (cp.getMinX() + x), (int) (cp.getMinY() + y));
-        }
-        
-        private int getCaretFromCoord(TextField text, MouseEvent e) {
-                TextFieldSkin skin = (TextFieldSkin) text.getSkin();
-                HitInfo hit = skin.getIndex(e);
-                return hit.getInsertionIndex();
-        }
-        
-        /**
-         * @param src The MouseEvent to clone
-         * @param node The node the position will be relative to
-         * @param x The position in Expeditee space
-         * @param y The position in Expeditee space
-         * @return A fake MouseEvent for a specific position relative to a Node
-         */
-        private MouseEvent getMouseEventForPosition(MouseEvent src, Node node, int x, int y) {
-                MouseEvent dst = (MouseEvent) ((Event) src).copyFor(null, null);
-                try {
-                MouseEvent_x.set(dst, x - node.localToScene(0, 0).getX());
-                MouseEvent_y.set(dst, y - node.localToScene(0, 0).getY());
-        } catch (Exception e) {
-                e.printStackTrace();
-        }
-                return dst;
-        }
 
         public JfxBrowser(Text source, final String[] args) {
@@ -236 +205 @@
                         this._urlProgressBar.getStyleClass().add("url-progress-bar");
                         this._urlProgressBar.setMaxSize(Double.MAX_VALUE, Double.MAX_VALUE);
+                        
+                        // Status label that displays the URL when a link is hovered over
+                        this._statusLabel = new Label();
+                        this._statusLabel.getStyleClass().addAll("browser-status-label");
+                        this._statusLabel.setVisible(false);
+                        
+                        this._statusFadeIn = new FadeTransition();
+                        this._statusFadeIn.setDuration(Duration.millis(200));
+                        this._statusFadeIn.setNode(this._statusLabel);
+                        this._statusFadeIn.setFromValue(0);
+                        this._statusFadeIn.setToValue(1);
+                        this._statusFadeIn.setCycleCount(1);
+                        this._statusFadeIn.setAutoReverse(false);
+                        
+                        this._statusFadeOut = new FadeTransition();
+                        this._statusFadeOut.setDuration(Duration.millis(400));
+                        this._statusFadeOut.setNode(this._statusLabel);
+                        this._statusFadeOut.setFromValue(1);
+                        this._statusFadeOut.setToValue(0);
+                        this._statusFadeOut.setCycleCount(1);
+                        this._statusFadeOut.setAutoReverse(false);
+                        
+                        this._statusFadeOut.setOnFinished(new EventHandler<ActionEvent>() {
+
+                                @Override
+                                public void handle(ActionEvent arg0) {
+                                        JfxBrowser.this._statusLabel.setVisible(false);
+                                }
+                        });
+                        
 
                         StackPane urlbar = new StackPane();
@@ -262 +261 @@
                         // size. This also means that the webview's prefSize must be manually set when the Pane resizes, using the event handlers below
                         Pane browserPane = new Pane();
-                        browserPane.getChildren().add(_webView);
+                        browserPane.getChildren().addAll(_webView, this._statusLabel);
                         
                         HBox.setHgrow(browserPane, Priority.ALWAYS);
@@ -280 +279 @@
                                 public void changed(ObservableValue<?> observable, Object oldValue, Object newValue) {
                                         JfxBrowser.this._webView.setPrefHeight((Double) newValue);
+                                        JfxBrowser.this._statusLabel.setTranslateY((Double) newValue - JfxBrowser.this._statusLabel.heightProperty().doubleValue());
                                 }
                         });
@@ -317 +317 @@
                         // Disable right click menu
                         this._webView.setContextMenuEnabled(false);
+                        
+                        // Showing the status label when a link is hovered over
+                        this._webEngine.setOnStatusChanged(new EventHandler<WebEvent<String>>() {
+                                
+                                @Override
+                                public void handle(WebEvent<String> arg0) {
+                                        if (arg0.getData() != null && hasValidProtocol(arg0.getData())) {
+                                                JfxBrowser.this._statusLabel.setText(arg0.getData());
+                                                
+                                                JfxBrowser.this._statusFadeOut.stop();
+                                                
+                                                if(JfxBrowser.this._statusLabel.isVisible()) {
+                                                        // Don't play the fade in if the label is already partially visible
+                                                        JfxBrowser.this._statusLabel.setOpacity(1);
+                                                } else {
+                                                        JfxBrowser.this._statusLabel.setVisible(true);
+                                                        JfxBrowser.this._statusFadeIn.play();
+                                                }
+                                        } else {
+                                                JfxBrowser.this._statusFadeIn.stop();
+
+                                                JfxBrowser.this._statusFadeOut.play();
+                                        }
+                                }
+                        });
+                        
+                        
                         final EventDispatcher initial = this._urlField.getEventDispatcher();
+                        
                         this._urlField.setEventDispatcher(new EventDispatcher() {
                                 @Override
@@ -958 +986 @@
         }
         
+        private Point getCoordFromCaret(TextField text) {
+                TextFieldSkin skin = (TextFieldSkin) text.getSkin();
+                
+                Point2D onScene = text.localToScene(0, 0);
+                
+                double x = onScene.getX() + JfxBrowser.this.getX();// - org.expeditee.gui.Browser._theBrowser.getOrigin().x;
+                double y = onScene.getY() + JfxBrowser.this.getY();// - org.expeditee.gui.Browser._theBrowser.getOrigin().y;
+                
+                Rectangle2D cp = skin.getCharacterBounds(text.getCaretPosition());
+                
+                return new Point((int) (cp.getMinX() + x), (int) (cp.getMinY() + y));
+        }
+        
+        private int getCaretFromCoord(TextField text, MouseEvent e) {
+                TextFieldSkin skin = (TextFieldSkin) text.getSkin();
+                HitInfo hit = skin.getIndex(e);
+                return hit.getInsertionIndex();
+        }
+        
+        /**
+         * @param src The MouseEvent to clone
+         * @param node The node the position will be relative to
+         * @param x The position in Expeditee space
+         * @param y The position in Expeditee space
+         * @return A fake MouseEvent for a specific position relative to a Node
+         */
+        private MouseEvent getMouseEventForPosition(MouseEvent src, Node node, int x, int y) {
+                MouseEvent dst = (MouseEvent) ((Event) src).copyFor(null, null);
+                try {
+                MouseEvent_x.set(dst, x - node.localToScene(0, 0).getX());
+                MouseEvent_y.set(dst, y - node.localToScene(0, 0).getY());
+        } catch (Exception e) {
+                e.printStackTrace();
+        }
+                return dst;
+        }
+        
         private void enableReadableMode() {
                 String readabilityJs;