git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
get fontmetrics from pg
[jalview.git]
/
src
/
jalview
/
gui
/
Desktop.java
diff --git
a/src/jalview/gui/Desktop.java
b/src/jalview/gui/Desktop.java
index
7031e99
..
45a03fa
100755
(executable)
--- a/
src/jalview/gui/Desktop.java
+++ b/
src/jalview/gui/Desktop.java
@@
-47,6
+47,7
@@
public class Desktop extends jalview.jbgui.GDesktop
public static jalview.ws.Discoverer discoverer;
public static Object [] jalviewClipboard;
public static jalview.ws.Discoverer discoverer;
public static Object [] jalviewClipboard;
+ public static boolean internalCopy = false;
static int fileLoadingCount= 0;
static int fileLoadingCount= 0;
@@
-251,7
+252,10
@@
public class Desktop extends jalview.jbgui.GDesktop
public void lostOwnership(Clipboard clipboard, Transferable contents)
{
public void lostOwnership(Clipboard clipboard, Transferable contents)
{
- Desktop.jalviewClipboard = null;
+ if (!internalCopy)
+ Desktop.jalviewClipboard = null;
+
+ internalCopy = false;
}
public void dragEnter(DropTargetDragEvent evt)
}
public void dragEnter(DropTargetDragEvent evt)
@@
-880,5
+884,6
@@
public class Desktop extends jalview.jbgui.GDesktop
vamsasStop.setVisible(!b);
}
vamsasStop.setVisible(!b);
}
+
}
}