Changeset 1047 for trunk/src/org/expeditee/gui/FrameMouseActions.java

Timestamp:

04/28/16 19:37:35 (8 years ago)

Author:

davidb

Message:

Anchor top and left added as minus options to an @i item. Relocation of ParseArgsApache(). Addition of getData type function for Bool. Some typos fixed in comments. Left click on image refinement: it check the pixel clicked on in the image, and if the same as the background, it does a back() operation rather than forming a new link

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (7 diffs)

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -19 +19 @@
 package org.expeditee.gui;
 
+import java.awt.Color;
 import java.awt.Image;
 import java.awt.Point;
@@ -911 +912 @@
 
                 /*
-                 * This makes it so clicking repeatedly on the frameName doesnt add the
+                 * This makes it so clicking repeatedly on the frameName doesn't add the
                  * frames to the backup stack. Only the first frame is added to the
                  * backup stack.
@@ -945 +946 @@
 
                 // Mike says...
-                // For somereason the modifiers for e are different from modifiersEx
+                // For some reason the modifiers for e are different from modifiersEx
                 // The SwingUtilities.convertMouseEvent method changes the modifiers
                 _lastMouseClick = e;
@@ -1060 +1061 @@
                 // Auto-hide popups when user clicks into expeditee world
                 // If the user clicks into empty space and a popup-is showing, then
-                // the user porbably wants to click away the popup - therefore ignore
+                // the user probably wants to click away the popup - therefore ignore
                 // the event
                 boolean shouldConsume = PopupManager.getInstance()
@@ -1401 +1402 @@
                 if (clicked instanceof Text) {
                         Text text = (Text) clicked;
-                        /* Dont follow link when just highlighting text with the left button */
+                        /* Don't follow link when just highlighting text with the left button */
                         if (text.getText().length() == 0)
                                 clicked = null;
@@ -1457 +1458 @@
                 }
 
+                
+                if (clicked instanceof Picture) {
+                        int mouseX = DisplayIO.getMouseX();
+                        int mouseY = FrameMouseActions.getY();
+                        Picture clickedOnPicture = (Picture)clicked;
+                        Frame current_frame = DisplayIO.getCurrentFrame();
+                        Color bg_col = current_frame.getBackgroundColor();
+                        if (clickedOnPicture.MouseOverBackgroundPixel(mouseX,mouseY,bg_col)) {
+                                // Make 'clicked' null, effectively causing a back() operation
+                                clicked = null;
+                        }
+                }
+                
                 if (clicked != null) {
                         // check item permissions
@@ -1500 +1514 @@
 
                 } else {
+                        
                         IndirectMouseActions.getInstance().getBackAction().exec(new MouseInfo(clicked, clickedIn, isShiftDown, isControlDown));
                 }