X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fsrc%2Forg%2Fsimantics%2Fdiagram%2Felements%2FTextNode.java;h=96cd573cc626860a43d51775d7cb20106ca98a3b;hp=ed8df095a72b587f297002fcc3ecca9d80852e04;hb=bf75fd9;hpb=21f879fcd72d7749836fb64375094ef29573fe8c

diff --git a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
index ed8df095a..96cd573cc 100644
--- a/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
+++ b/bundles/org.simantics.diagram/src/org/simantics/diagram/elements/TextNode.java
@@ -11,8 +11,6 @@
  *******************************************************************************/
 package org.simantics.diagram.elements;
 
-import gnu.trove.list.array.TIntArrayList;
-
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -42,6 +40,7 @@ import java.text.AttributedString;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Hashtable;
+import java.util.List;
 
 import org.simantics.datatypes.literal.RGB;
 import org.simantics.db.layer0.variable.RVI;
@@ -62,15 +61,17 @@ import org.simantics.scenegraph.g2d.events.MouseEvent.MouseClickEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseDoubleClickedEvent;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseDragBegin;
 import org.simantics.scenegraph.g2d.events.MouseEvent.MouseMovedEvent;
+import org.simantics.scenegraph.g2d.events.NodeEventHandler;
 import org.simantics.scenegraph.g2d.events.command.CommandEvent;
 import org.simantics.scenegraph.g2d.events.command.Commands;
-import org.simantics.scenegraph.g2d.events.NodeEventHandler;
 import org.simantics.scenegraph.utils.GeometryUtils;
 import org.simantics.scenegraph.utils.NodeUtil;
 import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.function.Function2;
 import org.simantics.ui.colors.Colors;
 import org.simantics.ui.dnd.LocalObjectTransferable;
+import org.simantics.ui.dnd.MultiTransferable;
+import org.simantics.ui.dnd.PlaintextTransfer;
 import org.simantics.ui.fonts.Fonts;
 import org.simantics.utils.threads.AWTThread;
 
@@ -82,6 +83,8 @@ import com.lowagie.text.pdf.PdfFormField;
 import com.lowagie.text.pdf.PdfWriter;
 import com.lowagie.text.pdf.TextField;
 
+import gnu.trove.list.array.TIntArrayList;
+
 
 /**
  * TextNode which supports in-line editing.
@@ -1858,9 +1861,19 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
         if (isHovering()
                 && (isControlDown(e) || isShiftDown(e))
                 && e.context instanceof NodeEventHandler
-                && dataRVI != null)
+                && (dataRVI != null || text != null))
         {
-            e.transferable = new LocalObjectTransferable(dataRVI);
+            List<Transferable> trs = new ArrayList<>(2);
+            if (dataRVI != null) {
+                trs.add(new LocalObjectTransferable(dataRVI));
+                trs.add(new PlaintextTransfer(dataRVI.toString()));
+            } else if (text != null && !text.isEmpty()) {
+                trs.add(new PlaintextTransfer(text));
+            }
+            if (!trs.isEmpty()) {
+                e.transferable = new MultiTransferable(trs);
+                return true;
+            }
         }
         return false;
     }
@@ -1930,7 +1943,7 @@ public class TextNode extends G2DNode implements IDynamicSelectionPainterNode, L
     @Override
     public int getEventMask() {
         return EventTypes.KeyPressedMask | EventTypes.MouseMovedMask | EventTypes.MouseButtonPressedMask
-                | EventTypes.MouseClickMask | EventTypes.CommandMask;
+                | EventTypes.MouseClickMask | EventTypes.MouseDragBeginMask | EventTypes.CommandMask;
     }
 
     private MouseEvent lastMouseEvent = null;