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

Timestamp:

05/16/08 10:25:28 (16 years ago)

Author:

ra33

Message:

A whole day of big changes.
Adding the ability to have Text at the end of Lines.
Also a lot of refactoring to improve the quality of code relating to constraints and lines

File:

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

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

@@ -905 +905 @@
                                 Rectangle textOutline = text.getLogicalHighlightShape(0,
                                                 text.getCharacterCount()).getBounds();
-                                textOutline.translate(getX(), textY);
+                                textOutline.width += 2;
+                                textOutline.height += 2;
+                                
+                                textOutline.translate(getX() -1, textY - 1);
                                 if (p.intersects(textOutline))
                                         return true;
@@ -1451 +1454 @@
         @Override
         public Item merge(Item merger, int mouseX, int mouseY) {
-                if (merger instanceof Dot) {
-                        Dot d = (Dot) merger;
+                
+                if (merger.isLineEnd()) {
+                        if (merger instanceof Text)
+                                insertText(((Text)merger).getTextNoList(), mouseX, mouseY);
+                        
+                        //this.setPosition(merger.getPosition());
                         List<Line> lines = new LinkedList<Line>();
-                        lines.addAll(d.getLines());
-                        for (Line line : lines)
-                                line.replaceEnd(d, this);
-
-                        d.removeAllLines();
+                        lines.addAll(merger.getLines());
+                        for (Line line : lines){
+                                line.replaceEnd(merger, this);
+                        }
+                        merger.delete();
+                        this.setOffset(0,0);
                         return null;
                 }
@@ -1569 +1577 @@
                 setVisible(false);
         }
+        
+        @Override
+        public void anchor() {
+                super.anchor();
+                // ensure all text items have their selection cleared
+                clearSelection();
+                setAlpha(0);
+        }
 }