Changeset 1428 for trunk

Timestamp:

08/08/19 10:28:52 (5 years ago)

Author:

bln4

Message:

Fixed bug with background color click on images that had been scaled.

Location:

trunk/src/org/expeditee

Files:

• gio/swing/SwingImageManager.java (modified) (2 diffs)
• gio/swing/SwingInputManager.java (modified) (1 diff)
• items/Picture.java (modified) (1 diff)

trunk/src/org/expeditee/gio/swing/SwingImageManager.java

@@ -284 +284 @@
 
         @Override
-        public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height)
-        {
+        public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height) {
                 // Make sure we have a valid image
                 java.awt.Image swingImage = getInternalImage(image);
@@ -295 +294 @@
                 // Make sure the given coordinate are within the bounds of the image
                 AxisAlignedBoxBounds selectedArea = new AxisAlignedBoxBounds(x, y, width, height);
-                if (!image.getBounds().completelyContains(selectedArea)) return null;
+                AxisAlignedBoxBounds bounds = image.getBounds();
+                if (!bounds.completelyContains(selectedArea)) { 
+                        return null;
+                }
                 
                 // Create an pixel grabber to get the pixel values

trunk/src/org/expeditee/gio/swing/SwingInputManager.java

@@ -35 +35 @@
 import org.expeditee.gio.input.InputEvent.InputType;
 import org.expeditee.gio.input.KBMInputEvent;
-import org.expeditee.gio.input.KBMInputEvent.Key;
-import org.expeditee.gio.input.StandardInputEventListeners;
 import org.expeditee.gui.Popup;
 import org.expeditee.gui.PopupManager;

trunk/src/org/expeditee/items/Picture.java

@@ -974 +974 @@
                 int x = mouseX - base_x;
                 int y = mouseY - base_y;
-                
-                Colour c = _image.getPixel(x, y);
-
+                int xInverseScale = Math.round(x / _scale);
+                int yInverseScale = Math.round(y / _scale);
+                
+                Colour c = _image.getPixel(xInverseScale, yInverseScale);
+                int c_alpha  = c.getAlpha255();
+                if (c_alpha == 0) {
+                        return true;
+                }
+                
                 int c_red    = c.getRed255();
                 int c_green  = c.getGreen255();