Changeset 222

Timestamp:

08/13/08 16:23:44 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee/items/widgets

Files:

• InteractiveWidget.java (modified) (1 diff)
• WidgetCorner.java (modified) (1 diff)
• WidgetEdge.java (modified) (1 diff)

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

@@ -1066 +1066 @@
 
         /**
+         * 
+         * @return
+         *              The current bounds for this widget. Never null.
+         */
+        public Rectangle getBounds() {
+                return new Rectangle(getX(), getY(), getWidth(), getHeight());
+        }
+
+        /**
          * Due to absolute positioning...
          * 

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

@@ -156 +156 @@
         @Override
         public boolean contains(int x, int y) {
-                return super.contains(x, y) && !getEnclosedShape().contains(x, y);
+                return super.contains(x, y) && !_widgetSource.getBounds().contains(x, y);
         }
 

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

@@ -98 +98 @@
         @Override
         public boolean contains(int x, int y) {
-                return super.contains(x, y) && !getEnclosedShape().contains(x, y);
+                return super.contains(x, y) && !_widgetSource.getBounds().contains(x, y);
         }