Changeset 573 for trunk/src/org/expeditee/items/widgets

Timestamp:

12/05/13 16:36:38 (11 years ago)

Author:

csl14

Message:

added ItemsRightClickedDropped and ItemsLeftClickedDropped for expeditee like text-widget interaction for the url field in JfxBrowser

Location:

trunk/src/org/expeditee/items/widgets

Files:

• InteractiveWidget.java (modified) (2 diffs)
• JfxBrowser.java (modified) (5 diffs)

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

@@ -1723 +1723 @@
         
         /**
-         * Event called when the widget is left clicked while there are items attached to the FreeItems buffer
-         * 
-         * @return true if event was handled (no pass through), otherwise false
+         * Event called when the widget is left clicked while there are items attached to the FreeItems buffer.
+         * Used to enable expeditee like text-widget interaction for left mouse clicks.
+         * @return true if event was handled (no pass through), otherwise false.
          */
         public boolean ItemsLeftClickDropped() {
@@ -1732 +1732 @@
         
         /**
-         * Event called when the widget is middle clicked while there are items attached to the FreeItems buffer
-         * 
-         * @return true if event was handled (no pass through), otherwise false
+         * Event called when the widget is middle clicked while there are items attached to the FreeItems buffer.
+         * Used to enable expeditee like text-widget interaction for middle mouse clicks.
+         * @return true if event was handled (no pass through), otherwise false.
          */
         public boolean ItemsMiddleClickDropped() {
-                System.out.println("MiddleClickDropped");
                 return false;
         }
         
         /**
-         * Event called when the widget is left clicked while there are items attached to the FreeItems buffer
-         * 
-         * @return true if event was handled (no pass through), otherwise false
+         * Event called when the widget is left clicked while there are items attached to the FreeItems buffer.
+         * Used to enable expeditee like text-widget interaction for right mouse clicks
+         * @return true if event was handled (no pass through), otherwise false.
          */
         public boolean ItemsRightClickDropped() {
-                System.out.println("RightClickDropped");
                 return false;
         }

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

@@ -4 +4 @@
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Point;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -25 +26 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.FrameUtils;
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
@@ -46 +46 @@
         private static final String REFRESH = "refresh";
         private static final String GETFRAME = "getframe";
+        
+        public static final int VERT_OFFSET = 50;
+        public static final int VERT_CROP = 88;
+        public static final int HORZ_CROP = 15;
         
         private WebBrowserPanel _browser;
@@ -333 +337 @@
                                                                 
                                                                 if(JavaFX.MouseEventGetButton.invoke(args[0]).equals(buttonEnum[1])) /* Left Mouse Button */ {
-/*$#remove*/System.err.println("Left Button Clicked");
+                                                                        
                                                                 } else if(JavaFX.MouseEventGetButton.invoke(args[0]).equals(buttonEnum[2])) /* Middle Mouse Button */ {
-/*$#remove*/System.err.println("Middle Button Clicked");
+                                                                        
                                                                 } else if(JavaFX.MouseEventGetButton.invoke(args[0]).equals(buttonEnum[3])) /* Right Mouse Button */ {
-/*$#remove*/System.err.println("Right Button Clicked");
                                                                         // Gets text currently selected in webview
                                                                         String selection = (String) JavaFX.WebEngineExecuteScript.invoke(JavaFX.WebViewGetEngine.invoke(webview), "window.getSelection().toString()");
@@ -574 +577 @@
         }
 
+        /**
+         * Used to enable expeditee like text-widget interaction for middle mouse clicks. Does nothing if a text item is not attached to cursor.
+         * @return false if a text-widget interaction did not occur, true if a text-widget interaction did occur.
+         */
+        @Override
+        public boolean ItemsMiddleClickDropped() {
+                Text t = null;
+                if((t = FreeItems.getTextAttachedToCursor()) == null) { // fails if no text item is attached to the cursor.
+                        return false;
+                }
+
+                Point p = new Point(FrameMouseActions.getX() - this.getX(), FrameMouseActions.getY() - this.getY());
+
+                if(!_browser.urlField.contains(p)) {                                    // fails if not clicking on urlField
+                        return false;
+                }
+
+                // Inserts text in text item into urlField at the position of the mouse.
+                String s = _browser.urlField.getText();
+                int index = _browser.urlField.viewToModel(new Point(p.x - _browser.urlField.getX(), p.y - _browser.urlField.getY()));
+                s = s.substring(0, index) + t.getText() + s.substring(index);
+                _browser.urlField.setText(s);
+
+                FreeItems.getInstance().clear();                                                // removed held text item - like normal expeditee middle click behaviour.
+
+                return true;
+        }
+        
+        /**
+         * Used to enable expeditee like text-widget interaction for right mouse clicks. Does nothing if a text item is not attached to cursor.
+         * @return false if a text-widget interaction did not occur, true if a text-widget interaction did occur.
+         */
+        @Override
+        public boolean ItemsRightClickDropped() {
+                Text t = null;
+                if((t = FreeItems.getTextAttachedToCursor()) == null) { // fails if no text item is attached to the cursor.
+                        return false;
+                }
+
+                Point p = new Point(FrameMouseActions.getX() - this.getX(), FrameMouseActions.getY() - this.getY());
+
+                if(!_browser.urlField.contains(p)) {                                    // fails if not clicking on urlField
+                        return false;
+                }
+
+                // Inserts text in text item into urlField at the position of the mouse.
+                String s = _browser.urlField.getText();
+                int index = _browser.urlField.viewToModel(new Point(p.x - _browser.urlField.getX(), p.y - _browser.urlField.getY()));
+                s = s.substring(0, index) + t.getText() + s.substring(index);
+                _browser.urlField.setText(s);
+
+                return true;
+        }
+        
         @Override
         protected String[] getArgs() {