Changeset 131 for trunk/src/org/expeditee/items/Item.java

Timestamp:

07/10/08 12:32:54 (16 years ago)

Author:

ra33

Message:

Fixed a couple of minor repaint issues such problems when TwoEnclosed areas of identical size where on a vector frame

Also fixed cutting and pasting...

Added functionality to be able to cut and paste a selected region in a text item

File:

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

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

@@ -760 +760 @@
 
         protected Color getPaintHighlightColor() {
+                Color highlightColor = _highlightColor;
+                if (getPaintBackgroundColor().equals(highlightColor))
+                        highlightColor = ALTERNATE_HIGHLIGHT;
                 if (getParent() != null
-                                && getParent().getPaintBackgroundColor()
-                                                .equals(_highlightColor))
-                        return getParent().getPaintForegroundColor();
-
-                return _highlightColor;
+                                && getParent().getPaintBackgroundColor().equals(highlightColor))
+                        highlightColor = getParent().getPaintForegroundColor();
+
+                return highlightColor;
         }
 
@@ -1111 +1113 @@
 
         public void setActionMark(boolean val) {
+                if (!val)
+                        invalidateCommonTrait(ItemAppearence.LinkChanged);
                 _poly = null;
                 _actionMark = val;
-                invalidateCommonTrait(ItemAppearence.LinkChanged);
+                if (val)
+                        invalidateCommonTrait(ItemAppearence.LinkChanged);
         }
 
@@ -1891 +1896 @@
                         invalidateCommonTrait(ItemAppearence.LinkChanged);
                 }
-                if(_actions == null || _actions.size() == 0) {
+                if (_actions == null || _actions.size() == 0) {
                         _poly = null;
                         _actions = new LinkedList<String>();
-                }else{
+                } else {
                         _actions.clear();
                 }
@@ -2079 +2084 @@
                 return box.getWidth() * box.getHeight();
         }
+        
+        public int getEnclosureID(){
+                return _enclosure.hashCode();
+        }
 
         /**