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 'develop' into bug/JAL-4059_update_swingJS_for_JalviewJS_2_11_2_and_2_11_3
[jalview.git]
/
src
/
jalview
/
gui
/
IdwidthAdjuster.java
diff --git
a/src/jalview/gui/IdwidthAdjuster.java
b/src/jalview/gui/IdwidthAdjuster.java
index
4596e1f
..
99a39d4
100755
(executable)
--- a/
src/jalview/gui/IdwidthAdjuster.java
+++ b/
src/jalview/gui/IdwidthAdjuster.java
@@
-158,8
+158,19
@@
public class IdwidthAdjuster extends JPanel
{
return;
}
{
return;
}
+
+ // TODO JAL-4260 - work out how to trigger recomputation of wrapped pages !
+ int curCol = viewport.getRanges().getStartRes()
+ + viewport.getRanges().getViewportWidth();
+
viewport.setIdWidth(newWidth);
viewport.setIdWidth(newWidth);
+
ap.validateAnnotationDimensions(false);
ap.validateAnnotationDimensions(false);
+ if (viewport.getWrapAlignment())
+ {
+ viewport.getRanges().scrollToWrappedVisible(
+ curCol - viewport.getRanges().getViewportWidth());
+ }
ap.paintAlignment(true, false);
ap.getIdPanel().getIdCanvas().setManuallyAdjusted(true);
ap.paintAlignment(true, false);
ap.getIdPanel().getIdCanvas().setManuallyAdjusted(true);
@@
-168,7
+179,7
@@
public class IdwidthAdjuster extends JPanel
public void setWidth(int newWidth)
{
if (newWidth < MIN_ID_WIDTH
public void setWidth(int newWidth)
{
if (newWidth < MIN_ID_WIDTH
- || ap.getIdPanel().getIdCanvas().manuallyAdjusted())
+ || ap.getIdPanel().getIdCanvas().isManuallyAdjusted())
{
return;
}
{
return;
}
@@
-179,7
+190,7
@@
public class IdwidthAdjuster extends JPanel
public boolean manuallyAdjusted()
{
public boolean manuallyAdjusted()
{
- return ap.getIdPanel().getIdCanvas().manuallyAdjusted();
+ return ap.getIdPanel().getIdCanvas().isManuallyAdjusted();
}
@Override
}
@Override