X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSeqPanel.java;h=126d755212f545bbc975941771e0c01f40094ef8;hb=a853fae4d9d4dbc80e877741c017fca7ee80c59e;hp=d081f162aa91861e9e285bcf5d61ce9ffaed934d;hpb=f0ea7e292e26e7cec19720be39b143d261f53821;p=jalview.git diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java index d081f16..126d755 100755 --- a/src/jalview/gui/SeqPanel.java +++ b/src/jalview/gui/SeqPanel.java @@ -597,48 +597,48 @@ public class SeqPanel extends JPanel implements MouseListener, */ public void mouseDragged(MouseEvent evt) { - if(mouseWheelPressed) + if (mouseWheelPressed) { int oldWidth = av.charWidth; //Which is bigger, left-right or up-down? - if( Math.abs(evt.getY()-lastMousePress.getY()) - > Math.abs(evt.getX()-lastMousePress.getX())) - { - int fontSize = av.font.getSize(); - - if (evt.getY() < lastMousePress.getY() && av.charHeight > 1) - { - fontSize--; - } - else if (evt.getY() > lastMousePress.getY()) - { - fontSize++; - } + if (Math.abs(evt.getY() - lastMousePress.getY()) + > Math.abs(evt.getX() - lastMousePress.getX())) + { + int fontSize = av.font.getSize(); - av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize)); - av.charWidth = oldWidth; - ap.fontChanged(); + if (evt.getY() < lastMousePress.getY()) + { + fontSize--; + } + else if (evt.getY() > lastMousePress.getY()) + { + fontSize++; + } + if(fontSize<1) + fontSize = 1; - } - else - { - if (evt.getX() < lastMousePress.getX() && av.charWidth > 1) - { - av.charWidth--; - } - else if (evt.getX() > lastMousePress.getX()) - { - av.charWidth++; - } + av.setFont(new Font(av.font.getName(), av.font.getStyle(), fontSize)); + av.charWidth = oldWidth; + ap.fontChanged(); + } + else + { + if (evt.getX() < lastMousePress.getX() && av.charWidth > 1) + { + av.charWidth--; + } + else if (evt.getX() > lastMousePress.getX()) + { + av.charWidth++; + } - ap.repaint(); - } + ap.repaint(); + } - FontMetrics fm = getFontMetrics(av.getFont()); - av.showText = (fm.charWidth('M') < av.charWidth); - // && fm.getHeight()