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 branch 'releases/Release_2_11_3_Branch'
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationLabels.java
diff --git
a/src/jalview/gui/AnnotationLabels.java
b/src/jalview/gui/AnnotationLabels.java
index
94f8790
..
7c5afcd
100755
(executable)
--- a/
src/jalview/gui/AnnotationLabels.java
+++ b/
src/jalview/gui/AnnotationLabels.java
@@
-793,9
+793,15
@@
public class AnnotationLabels extends JPanel
{
Dimension d = ap.annotationScroller.getPreferredSize();
int dif = evt.getY() - oldY;
{
Dimension d = ap.annotationScroller.getPreferredSize();
int dif = evt.getY() - oldY;
+ dif -= dif % ap.av.getCharHeight();
- dif /= ap.av.getCharHeight();
- dif *= ap.av.getCharHeight();
+ // don't allow setting an annotation panel height larger than visible
+ // (otherwise you can't get back)
+ if (d.height - dif > ap.idPanelHolder.getHeight()
+ - ap.getIdSpaceFillerPanel1().getHeight())
+ {
+ return;
+ }
if ((d.height - dif) > 20)
{
if ((d.height - dif) > 20)
{
@@
-1206,8
+1212,8
@@
public class AnnotationLabels extends JPanel
if (ap != null)
{
iwa = ap.idwidthAdjuster;
if (ap != null)
{
iwa = ap.idwidthAdjuster;
- if ((Cache.getDefault(ADJUST_ANNOTATION_LABELS_WIDTH_PREF, true)
- || Jalview.isHeadlessMode()))
+ if (Cache.getDefault(ADJUST_ANNOTATION_LABELS_WIDTH_PREF, true)
+ || Jalview.isHeadlessMode())
{
Graphics2D g2d = (Graphics2D) g;
Graphics dummy = g2d.create();
{
Graphics2D g2d = (Graphics2D) g;
Graphics dummy = g2d.create();