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
Colour is a panel, not button
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureRenderer.java
diff --git
a/src/jalview/gui/FeatureRenderer.java
b/src/jalview/gui/FeatureRenderer.java
index
e9f9d55
..
e736795
100755
(executable)
--- a/
src/jalview/gui/FeatureRenderer.java
+++ b/
src/jalview/gui/FeatureRenderer.java
@@
-438,13
+438,12
@@
public class FeatureRenderer
final JSpinner start = new JSpinner();
\r
final JSpinner end = new JSpinner();
\r
\r
final JSpinner start = new JSpinner();
\r
final JSpinner end = new JSpinner();
\r
\r
- // final JTextField start = new JTextField(6);
\r
- // final JTextField end = new JTextField(6);
\r
- final JButton colour = new JButton(" ");
\r
+ final JPanel colour = new JPanel();
\r
+ colour.setBorder(BorderFactory.createEtchedBorder());
\r
colour.setMaximumSize(new Dimension(40,10));
\r
colour.setMaximumSize(new Dimension(40,10));
\r
- colour.addActionListener(new ActionListener()
\r
+ colour.addMouseListener(new MouseAdapter()
\r
{
\r
{
\r
- public void actionPerformed(ActionEvent evt)
\r
+ public void mousePressed(MouseEvent evt)
\r
{
\r
colour.setBackground(
\r
JColorChooser.showDialog(Desktop.desktop,
\r
{
\r
colour.setBackground(
\r
JColorChooser.showDialog(Desktop.desktop,
\r
@@
-582,11
+581,12
@@
public class FeatureRenderer
else
\r
options = new Object[]{"OK", "Cancel"};
\r
\r
else
\r
options = new Object[]{"OK", "Cancel"};
\r
\r
+ String title = newFeatures ? "Create New Sequence Feature(s)" :
\r
+ "Amend/Delete Features";
\r
+
\r
int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,
\r
bigPanel,
\r
int reply = JOptionPane.showInternalOptionDialog(Desktop.desktop,
\r
bigPanel,
\r
- newFeatures ?
\r
- "Create New Sequence Feature(s)" :
\r
- "Amend/Delete Features",
\r
+ title,
\r
JOptionPane.YES_NO_CANCEL_OPTION,
\r
JOptionPane.QUESTION_MESSAGE,
\r
null,
\r
JOptionPane.YES_NO_CANCEL_OPTION,
\r
JOptionPane.QUESTION_MESSAGE,
\r
null,
\r