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
Merge remote-tracking branch 'origin/task/JAL-2662' into develop
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureColourChooser.java
diff --git
a/src/jalview/gui/FeatureColourChooser.java
b/src/jalview/gui/FeatureColourChooser.java
index
396df04
..
d8db546
100644
(file)
--- a/
src/jalview/gui/FeatureColourChooser.java
+++ b/
src/jalview/gui/FeatureColourChooser.java
@@
-31,6
+31,8
@@
import java.awt.Dimension;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.FlowLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.awt.event.FocusAdapter;
+import java.awt.event.FocusEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
@@
-145,7
+147,7
@@
public class FeatureColourChooser extends JalviewDialog
*/
if (ap != null)
{
*/
if (ap != null)
{
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
}
}
});
}
}
});
@@
-288,6
+290,14
@@
public class FeatureColourChooser extends JalviewDialog
thresholdValue_actionPerformed();
}
});
thresholdValue_actionPerformed();
}
});
+ thresholdValue.addFocusListener(new FocusAdapter()
+ {
+ @Override
+ public void focusLost(FocusEvent e)
+ {
+ thresholdValue_actionPerformed();
+ }
+ });
slider.setPaintLabels(false);
slider.setPaintTicks(true);
slider.setBackground(Color.white);
slider.setPaintLabels(false);
slider.setPaintTicks(true);
slider.setBackground(Color.white);
@@
-386,9
+396,9
@@
public class FeatureColourChooser extends JalviewDialog
* feature type, and repaints the alignment, and optionally the Overview
* and/or structure viewer if open
*
* feature type, and repaints the alignment, and optionally the Overview
* and/or structure viewer if open
*
- * @param updateOverview
+ * @param updateStructsAndOverview
*/
*/
- void changeColour(boolean updateOverview)
+ void changeColour(boolean updateStructsAndOverview)
{
// Check if combobox is still adjusting
if (adjusting)
{
// Check if combobox is still adjusting
if (adjusting)
@@
-497,7
+507,7
@@
public class FeatureColourChooser extends JalviewDialog
}
fr.setColour(type, acg);
cs = acg;
}
fr.setColour(type, acg);
cs = acg;
- ap.paintAlignment(updateOverview);
+ ap.paintAlignment(updateStructsAndOverview, updateStructsAndOverview);
}
@Override
}
@Override
@@
-529,7
+539,7
@@
public class FeatureColourChooser extends JalviewDialog
void reset()
{
fr.setColour(type, oldcs);
void reset()
{
fr.setColour(type, oldcs);
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
cs = null;
}
cs = null;
}
@@
-555,7
+565,7
@@
public class FeatureColourChooser extends JalviewDialog
/*
* force repaint of any Overview window or structure
*/
/*
* force repaint of any Overview window or structure
*/
- ap.paintAlignment(true);
+ ap.paintAlignment(true, true);
} catch (NumberFormatException ex)
{
}
} catch (NumberFormatException ex)
{
}