Changeset 746

Timestamp:

01/24/14 11:12:25 (10 years ago)

Author:

ngw8

Message:

Changed behaviour of copying/moving ranged text so that shift must be held to copy attributes

File:

• trunk/src/org/expeditee/gui/FrameMouseActions.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/FrameMouseActions.java

@@ -7 +7 @@
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
 import java.awt.event.ActionEvent;
@@ -19 +18 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Date;
@@ -589 +587 @@
                 if (lastRanged != null && e.getButton() != MouseEvent.BUTTON1) {
 
-                        Text ranged = DisplayIO.getCurrentFrame().createNewText();
-                        ranged.setColor(lastRanged.getColor());
-                        ranged.setBackgroundColor(lastRanged.getBackgroundColor());
-                        ranged.setFont(ranged.getFont());
-                        ranged.setWidth(lastRanged.getAbsoluteWidth() * -1);
+                        Text ranged;
+                        if (isShiftDown()) {
+                                // If shift is down, copy everything (size, color, etc.) except actions, links and data
+                                ranged = lastRanged.copy();
+                                ranged.setActions(null);
+                                ranged.setData((List<String>) null);
+                                ranged.setLink("");
+                        } else {
+                                // If shift isn't down, don't copy any attributes
+                                ranged = new Text("");
+                        }
 
                         // if the user is cutting text from the item