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-2922 update FeatureRenderer and repaint feature settings after Invert Selection
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationPanel.java
diff --git
a/src/jalview/gui/AnnotationPanel.java
b/src/jalview/gui/AnnotationPanel.java
index
c39a87d
..
dee56b0
100755
(executable)
--- a/
src/jalview/gui/AnnotationPanel.java
+++ b/
src/jalview/gui/AnnotationPanel.java
@@
-175,11
+175,12
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (e.isShiftDown())
{
e.consume();
if (e.isShiftDown())
{
e.consume();
- if (e.getWheelRotation() > 0)
+ double wheelRotation = e.getPreciseWheelRotation();
+ if (wheelRotation > 0)
{
av.getRanges().scrollRight(true);
}
{
av.getRanges().scrollRight(true);
}
- else
+ else if (wheelRotation < 0)
{
av.getRanges().scrollRight(false);
}
{
av.getRanges().scrollRight(false);
}
@@
-724,7
+725,7
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
if (av.hasHiddenColumns())
{
column = av.getAlignment().getHiddenColumns()
if (av.hasHiddenColumns())
{
column = av.getAlignment().getHiddenColumns()
- .adjustForHiddenColumns(column);
+ .visibleToAbsoluteColumn(column);
}
AlignmentAnnotation ann = aa[row];
}
AlignmentAnnotation ann = aa[row];
@@
-782,6
+783,10
@@
public class AnnotationPanel extends JPanel implements AwtRenderPanelI,
{
this.setToolTipText(JvSwingUtils.wrapTooltip(true, description));
}
{
this.setToolTipText(JvSwingUtils.wrapTooltip(true, description));
}
+ else
+ {
+ this.setToolTipText(null); // no tooltip if null or empty description
+ }
}
else
{
}
else
{