Changeset 218

Timestamp:

08/11/08 22:26:45 (16 years ago)

Author:

bjn8

Message:

Fixed bug

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

@@ -1062 +1062 @@
                         _swingComponent.setBounds(getX(), getY(), getWidth(), getHeight());
         }
+        
+        /**
+         * 
+         * @return
+         *              The current bounds for this widget. Never null.
+         */
+        public Rectangle getBounds() {
+                return new Rectangle(getX(), getY(), getWidth(), getHeight());
+        }
 
         /**

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

@@ -166 +166 @@
         @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

@@ -103 +103 @@
         @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);
         }