Changeset 807

Timestamp:

02/03/14 11:09:31 (10 years ago)

Author:

jts21

Message:

Hopefully fix incompatibility with Java 7 caused by using JavaFX features that did not exist in Java 7

File:

• trunk/src/org/expeditee/items/widgets/JfxBrowser.java (modified) (10 diffs)

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

@@ -10 +10 @@
  */
 import java.awt.Point;
+import java.lang.reflect.Field;
 
 import javafx.application.Platform;
@@ -23 +24 @@
 import javafx.geometry.Point2D;
 import javafx.geometry.Rectangle2D;
+import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
@@ -35 +37 @@
 import javafx.scene.web.WebView;
 
-import javax.swing.JComponent;
-
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameMouseActions;
@@ -72 +72 @@
         
         private MouseButton _buttonDownId = MouseButton.NONE;
+        private MouseEvent _backupEvent = null;
+        private static Field MouseEvent_x, MouseEvent_y;
 
         static {
                 Platform.setImplicitExit(false);
-        }
-        
-        private static Point getCoordFromCaret(TextField text) {
+                
+                try {
+                MouseEvent_x = MouseEvent.class.getDeclaredField("x");
+                MouseEvent_x.setAccessible(true);
+                MouseEvent_y = MouseEvent.class.getDeclaredField("y");
+                MouseEvent_y.setAccessible(true);
+                } catch (Exception e) {
+                e.printStackTrace();
+        }
+        }
+        
+        private Point getCoordFromCaret(TextField text) {
                 TextFieldSkin skin = (TextFieldSkin) text.getSkin();
                 
-                Point2D onScreen = text.localToScreen(0, 0);
-                double x = onScreen.getX() - org.expeditee.gui.Browser._theBrowser.getOrigin().x;
-                double y = onScreen.getY() - org.expeditee.gui.Browser._theBrowser.getOrigin().y;
+                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());
@@ -89 +101 @@
         }
         
-        private static int getCaretFromCoord(TextField text, int x, int y) {
+        private int getCaretFromCoord(TextField text, MouseEvent e) {
                 TextFieldSkin skin = (TextFieldSkin) text.getSkin();
-                
-                MouseEvent fakeMouseEvent = new MouseEvent(
-                        MouseEvent.MOUSE_MOVED, //EventType<? extends MouseEvent> eventType
-                        x - text.getBoundsInParent().getMinX(), // x
-                        y - text.getBoundsInParent().getMinY(), // y
-            FrameMouseActions.getX() + org.expeditee.gui.Browser._theBrowser.getOrigin().x, // screen x
-            FrameMouseActions.getY() + org.expeditee.gui.Browser._theBrowser.getOrigin().y, // screen y
-            MouseButton.NONE, // button
-            0,     // click count
-            false, // shift down
-            false, // control down
-            false, // alt down
-            false, // meta down
-            false, // primary button down
-            false, // middle button down
-            false, // secondary button down
-            true,  // synthesized
-            false, // popup trigger
-            false, // still since press
-            null   // pick result
-        );
-                
-                HitInfo hit = skin.getIndex(fakeMouseEvent);
-                
+                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;
         }
 
@@ -241 +248 @@
                                 @Override
                                 public void handle(MouseEvent e) {
+                                        JfxBrowser.this._backupEvent = e;
                                         // make sure we have focus if the mouse is moving over us
                                         if(!JfxBrowser.this._urlField.isFocused()) {
@@ -251 +259 @@
                                         } else {
                                                 // Otherwise, move the caret to the cursor location
-                                                int x = FrameMouseActions.getX() - JfxBrowser.this.getX(), y = FrameMouseActions.getY() - JfxBrowser.this.getY();
-                                                JfxBrowser.this._urlField.positionCaret(getCaretFromCoord(JfxBrowser.this._urlField, x, y));
+                                                // int x = FrameMouseActions.getX() - JfxBrowser.this.getX(), y = FrameMouseActions.getY() - JfxBrowser.this.getY();
+                                                JfxBrowser.this._urlField.positionCaret(getCaretFromCoord(JfxBrowser.this._urlField, e));
                                         }
                                 }
@@ -370 +378 @@
                                 @Override
                                 public void handle(javafx.scene.input.MouseEvent e) {
-                                        switch (e.getButton()) {
-                                        case SECONDARY:
+                                        if(e.getButton() == MouseButton.SECONDARY) {
                                                 // Gets text currently selected in webview
                                                 String selection = (String) JfxBrowser.this._webEngine.executeScript("window.getSelection().toString()");
@@ -383 +390 @@
                                                         FrameMouseActions.pickup(t);
                                                 }
-
-                                                break;
                                         }
                                 }
@@ -609 +614 @@
                                 // Inserts text in text item into urlField at the position of the mouse.
                         String s = JfxBrowser.this._urlField.getText();
-                        int index = getCaretFromCoord(JfxBrowser.this._urlField, x, y);
+                        int index = getCaretFromCoord(JfxBrowser.this._urlField, getMouseEventForPosition(JfxBrowser.this._backupEvent, JfxBrowser.this._urlField, x, y));
                         if(index < s.length()) {
                                 s = s.substring(0, index) + insert + s.substring(index);