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
JAL-2361 apply any saved changes to current colour scheme
[jalview.git]
/
src
/
jalview
/
gui
/
ColourMenuHelper.java
diff --git
a/src/jalview/gui/ColourMenuHelper.java
b/src/jalview/gui/ColourMenuHelper.java
index
19ad939
..
801615c
100644
(file)
--- a/
src/jalview/gui/ColourMenuHelper.java
+++ b/
src/jalview/gui/ColourMenuHelper.java
@@
-104,14
+104,14
@@
public class ColourMenuHelper
/*
* user-defined colour scheme loaded on startup or during the
* Jalview session; right-click on this offers the option to
/*
* user-defined colour scheme loaded on startup or during the
* Jalview session; right-click on this offers the option to
- * remove it as a colour choice
+ * remove it as a colour choice (unless currently selected)
*/
radioItem.addMouseListener(new MouseAdapter()
{
@Override
public void mousePressed(MouseEvent evt)
{
*/
radioItem.addMouseListener(new MouseAdapter()
{
@Override
public void mousePressed(MouseEvent evt)
{
- if (evt.isPopupTrigger()) // Mac
+ if (evt.isPopupTrigger() && !radioItem.isSelected()) // Mac
{
offerRemoval();
}
{
offerRemoval();
}
@@
-120,7
+120,7
@@
public class ColourMenuHelper
@Override
public void mouseReleased(MouseEvent evt)
{
@Override
public void mouseReleased(MouseEvent evt)
{
- if (evt.isPopupTrigger()) // Windows
+ if (evt.isPopupTrigger() && !radioItem.isSelected()) // Windows
{
offerRemoval();
}
{
offerRemoval();
}