Changeset 909 for trunk/src/org/expeditee/items/Text.java

Timestamp:

04/23/14 11:09:00 (10 years ago)

Author:

davidb

Message:

Text item changed to use a tighter intersects() method based on PixelBounds. Older version of intersects() also still available as intersectsOLD()

File:

• trunk/src/org/expeditee/items/Text.java (modified) (4 diffs)

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

@@ -1337 +1337 @@
         }
 
-        @Override
-        public boolean intersects(Polygon p) {
+        //@Override
+        public boolean intersectsOLD(Polygon p) {
                 if (super.intersects(p)) {
                         float textY = getY();
@@ -1356 +1356 @@
                         }
                 }
+                return false;
+        }
+        
+        // The following version of intersect uses a tighter definition for the text, based on 
+    @Override
+        public boolean intersects(Polygon p) {
+                if (super.intersects(p)) {
+                        float textY = getY();
+
+                        for (TextLayout text : _textLayouts) {
+                                
+                                Rectangle text_pixel_bounds_rect = this.getPixelBounds(text);
+                                
+                                if (p.intersects(text_pixel_bounds_rect)) {
+                                        return true;
+                                }
+                        }
+                }
+                
                 return false;
         }
@@ -1856 +1875 @@
                                 int ldx = 1+getX()+getJustOffset(layout); // Layout draw x
                                 
-                                boolean debug = false;
+                                boolean debug = true;
                                 if (debug) {
                                         g.setColor(new Color(c.getRed(),c.getGreen(),c.getBlue(),40));
@@ -2614 +2633 @@
 
         
+        protected Rectangle getPixelBounds(TextLayout layout)
+        {
+                // Does 'layout' need to be synchronized (similar to _textLayouts below)??
+                int x = getX();
+                int y = getY();
+
+                int ldx = 1+x+getJustOffset(layout); // Layout draw x                           
+                Rectangle layout_rect = layout.getPixelBounds(null, ldx, y);
+
+                return layout_rect;             
+        }
+        
         
         public Rectangle getPixelBoundsUnion()