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-3032 BorderLayout renders panel correctly in JalviewJS
[jalview.git]
/
src
/
jalview
/
gui
/
TextColourChooser.java
diff --git
a/src/jalview/gui/TextColourChooser.java
b/src/jalview/gui/TextColourChooser.java
index
53e2dee
..
faf19ad
100644
(file)
--- a/
src/jalview/gui/TextColourChooser.java
+++ b/
src/jalview/gui/TextColourChooser.java
@@
-21,6
+21,7
@@
package jalview.gui;
import jalview.datamodel.SequenceGroup;
package jalview.gui;
import jalview.datamodel.SequenceGroup;
+import jalview.gui.JalviewColourChooser.ColourChooserListener;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
@@
-32,7
+33,6
@@
import java.util.HashMap;
import java.util.Map;
import javax.swing.BorderFactory;
import java.util.Map;
import javax.swing.BorderFactory;
-import javax.swing.JColorChooser;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSlider;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSlider;
@@
-84,7
+84,7
@@
public class TextColourChooser
col2.setToolTipText(MessageManager.getString("label.light_colour"));
col2.setBackground(original2);
final JPanel bigpanel = new JPanel(new BorderLayout());
col2.setToolTipText(MessageManager.getString("label.light_colour"));
col2.setBackground(original2);
final JPanel bigpanel = new JPanel(new BorderLayout());
- JPanel panel = new JPanel();
+ JPanel panel = new JPanel(new BorderLayout());
bigpanel.add(panel, BorderLayout.CENTER);
bigpanel.add(
new JLabel("<html>"
bigpanel.add(panel, BorderLayout.CENTER);
bigpanel.add(
new JLabel("<html>"
@@
-92,23
+92,27
@@
public class TextColourChooser
"label.select_dark_light_set_threshold")
+ "</html>"),
BorderLayout.NORTH);
"label.select_dark_light_set_threshold")
+ "</html>"),
BorderLayout.NORTH);
- panel.add(col1);
- panel.add(slider);
- panel.add(col2);
+ panel.add(col1, BorderLayout.WEST);
+ panel.add(slider, BorderLayout.CENTER);
+ panel.add(col2, BorderLayout.EAST);
col1.addMouseListener(new MouseAdapter()
{
@Override
public void mousePressed(MouseEvent e)
{
col1.addMouseListener(new MouseAdapter()
{
@Override
public void mousePressed(MouseEvent e)
{
- Color col = JColorChooser.showDialog(bigpanel,
- MessageManager.getString("label.select_colour_for_text"),
- col1.getBackground());
- if (col != null)
+ String ttl = MessageManager.getString("label.select_colour_for_text");
+ ColourChooserListener listener = new ColourChooserListener()
{
{
- colour1Changed(col);
- col1.setBackground(col);
- }
+ @Override
+ public void colourSelected(Color c)
+ {
+ colour1Changed(c);
+ col1.setBackground(c);
+ }
+ };
+ JalviewColourChooser.showColourChooser(bigpanel, ttl,
+ col1.getBackground(), listener);
}
});
}
});
@@
-117,14
+121,18
@@
public class TextColourChooser
@Override
public void mousePressed(MouseEvent e)
{
@Override
public void mousePressed(MouseEvent e)
{
- Color col = JColorChooser.showDialog(bigpanel,
- MessageManager.getString("label.select_colour_for_text"),
- col2.getBackground());
- if (col != null)
+ String ttl = MessageManager.getString("label.select_colour_for_text");
+ ColourChooserListener listener = new ColourChooserListener()
{
{
- colour2Changed(col);
- col2.setBackground(col);
- }
+ @Override
+ public void colourSelected(Color c)
+ {
+ colour2Changed(c);
+ col2.setBackground(c);
+ }
+ };
+ JalviewColourChooser.showColourChooser(bigpanel, ttl,
+ col2.getBackground(), listener);
}
});
}
});