Changeset 1428 for trunk/src/org/expeditee/gio
- Timestamp:
- 08/08/19 10:28:52 (5 years ago)
- Location:
- trunk/src/org/expeditee/gio/swing
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/expeditee/gio/swing/SwingImageManager.java
r1427 r1428 284 284 285 285 @Override 286 public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height) 287 { 286 public Colour[] getPixels(org.expeditee.core.Image image, int x, int y, int width, int height) { 288 287 // Make sure we have a valid image 289 288 java.awt.Image swingImage = getInternalImage(image); … … 295 294 // Make sure the given coordinate are within the bounds of the image 296 295 AxisAlignedBoxBounds selectedArea = new AxisAlignedBoxBounds(x, y, width, height); 297 if (!image.getBounds().completelyContains(selectedArea)) return null; 296 AxisAlignedBoxBounds bounds = image.getBounds(); 297 if (!bounds.completelyContains(selectedArea)) { 298 return null; 299 } 298 300 299 301 // Create an pixel grabber to get the pixel values -
trunk/src/org/expeditee/gio/swing/SwingInputManager.java
r1415 r1428 35 35 import org.expeditee.gio.input.InputEvent.InputType; 36 36 import org.expeditee.gio.input.KBMInputEvent; 37 import org.expeditee.gio.input.KBMInputEvent.Key;38 import org.expeditee.gio.input.StandardInputEventListeners;39 37 import org.expeditee.gui.Popup; 40 38 import org.expeditee.gui.PopupManager;
Note:
See TracChangeset
for help on using the changeset viewer.