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
formatting
[jalview.git]
/
src
/
jalview
/
gui
/
AlignmentPanel.java
diff --git
a/src/jalview/gui/AlignmentPanel.java
b/src/jalview/gui/AlignmentPanel.java
index
4047ac8
..
d912b29
100755
(executable)
--- a/
src/jalview/gui/AlignmentPanel.java
+++ b/
src/jalview/gui/AlignmentPanel.java
@@
-711,9
+711,8
@@
public class AlignmentPanel extends GAlignmentPanel
Color currentColor = null;
\r
Color currentTextColor = null;
\r
\r
Color currentColor = null;
\r
Color currentTextColor = null;
\r
\r
- pg.setFont(new Font(av.getFont().getName(),
\r
- Font.ITALIC,
\r
- av.getFont().getSize()));
\r
+ pg.setFont(idPanel.idCanvas.idfont);
\r
+
\r
SequenceI seq;
\r
for (int i = startSeq; i < endSeq; i++)
\r
{
\r
SequenceI seq;
\r
for (int i = startSeq; i < endSeq; i++)
\r
{
\r
@@
-827,20
+826,20
@@
public class AlignmentPanel extends GAlignmentPanel
pg.setClip(0, pi * pheight, pwidth, pheight);
\r
\r
int ypos = hgap;
\r
pg.setClip(0, pi * pheight, pwidth, pheight);
\r
\r
int ypos = hgap;
\r
- Font italic = new Font(av.getFont().getName(), Font.ITALIC,
\r
- av.getFont().getSize());
\r
- pg.setFont(italic);
\r
+
\r
+
\r
\r
do
\r
{
\r
for (int i = 0; i < av.alignment.getHeight(); i++)
\r
{
\r
\r
do
\r
{
\r
for (int i = 0; i < av.alignment.getHeight(); i++)
\r
{
\r
+ pg.setFont(idPanel.idCanvas.idfont);
\r
SequenceI s = av.alignment.getSequenceAt(i);
\r
String string = s.getDisplayId( av.getShowJVSuffix());
\r
int xPos = 0;
\r
if (av.rightAlignIds)
\r
{
\r
SequenceI s = av.alignment.getSequenceAt(i);
\r
String string = s.getDisplayId( av.getShowJVSuffix());
\r
int xPos = 0;
\r
if (av.rightAlignIds)
\r
{
\r
- FontMetrics fm = getFontMetrics(italic);
\r
+ FontMetrics fm = pg.getFontMetrics();
\r
xPos = idWidth - fm.stringWidth( string ) - 4;
\r
}
\r
pg.drawString(string, xPos,
\r
xPos = idWidth - fm.stringWidth( string ) - 4;
\r
}
\r
pg.drawString(string, xPos,
\r
@@
-855,7
+854,6
@@
public class AlignmentPanel extends GAlignmentPanel
\r
pg.setFont(av.getFont());
\r
labels.drawComponent(pg, idWidth);
\r
\r
pg.setFont(av.getFont());
\r
labels.drawComponent(pg, idWidth);
\r
- pg.setFont(italic);
\r
pg.translate(+3,
\r
-ypos -
\r
(av.getAlignment().getHeight() * av.charHeight));
\r
pg.translate(+3,
\r
-ypos -
\r
(av.getAlignment().getHeight() * av.charHeight));
\r
@@
-902,7
+900,10
@@
public class AlignmentPanel extends GAlignmentPanel
if (System.getProperty("java.awt.headless") != null
\r
&& System.getProperty("java.awt.headless").equals("true"))
\r
{
\r
if (System.getProperty("java.awt.headless") != null
\r
&& System.getProperty("java.awt.headless").equals("true"))
\r
{
\r
- width = alignFrame.getWidth() - 22;
\r
+ width = alignFrame.getWidth()
\r
+ - vscroll.getPreferredSize().width
\r
+ - alignFrame.getInsets().left
\r
+ - alignFrame.getInsets().right;
\r
}
\r
else
\r
width = seqPanel.getWidth() + getVisibleIdWidth();
\r
}
\r
else
\r
width = seqPanel.getWidth() + getVisibleIdWidth();
\r
@@
-1112,11
+1113,14
@@
public class AlignmentPanel extends GAlignmentPanel
{
\r
int seqPanelWidth = seqPanel.seqCanvas.getWidth();
\r
\r
{
\r
int seqPanelWidth = seqPanel.seqCanvas.getWidth();
\r
\r
- //If headless, seqPanel will have 0 width
\r
if (System.getProperty("java.awt.headless") != null
\r
if (System.getProperty("java.awt.headless") != null
\r
- && System.getProperty("java.awt.headless").equals("true"))
\r
+ && System.getProperty("java.awt.headless").equals("true"))
\r
{
\r
{
\r
- seqPanelWidth = alignFrame.getWidth() - getVisibleIdWidth();
\r
+ seqPanelWidth = alignFrame.getWidth()
\r
+ - getVisibleIdWidth()
\r
+ - vscroll.getPreferredSize().width
\r
+ - alignFrame.getInsets().left
\r
+ - alignFrame.getInsets().right;
\r
}
\r
\r
int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(
\r
}
\r
\r
int chunkWidth = seqPanel.seqCanvas.getWrappedCanvasWidth(
\r