JAL-4020 Added search for PyMOLWinWithConsole.bat (and PyMOLWin.exe) in likely places...

[jalview.git] / src / jalview / appletgui / SeqPanel.java

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 2c07153..70366e4 100644 (file)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -42,6 +42,7 @@ import jalview.structure.VamsasSource;
 import jalview.util.Comparison;
 import jalview.util.MappingUtils;
 import jalview.util.MessageManager;
+import jalview.util.Platform;
 import jalview.viewmodel.AlignmentViewport;
 
 import java.awt.BorderLayout;
@@ -499,9 +500,7 @@ public class SeqPanel extends Panel implements MouseMotionListener,
 
     // For now, ignore the mouseWheel font resizing on Macs
     // As the Button2_mask always seems to be true
-    if ((evt.getModifiersEx()
-            & InputEvent.BUTTON2_DOWN_MASK) == InputEvent.BUTTON2_DOWN_MASK
-            && !av.MAC)
+    if (Platform.isWinMiddleButton(evt))
     {
       mouseWheelPressed = true;
       return;
@@ -908,7 +907,8 @@ public class SeqPanel extends Panel implements MouseMotionListener,
    */
   List<SequenceFeature> findFeaturesAtColumn(SequenceI sequence, int column)
   {
-    return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence, column);
+    return seqCanvas.getFeatureRenderer().findFeaturesAtColumn(sequence,
+            column);
   }
 
   Tooltip tooltip;
@@ -1196,9 +1196,9 @@ public class SeqPanel extends Panel implements MouseMotionListener,
         {
           if (sg.getSize() == av.getAlignment().getHeight())
           {
-            if ((av.hasHiddenColumns() && startres < av.getAlignment()
-                    .getHiddenColumns()
-                    .getNextHiddenBoundary(false, startres)))
+            if ((av.hasHiddenColumns()
+                    && startres < av.getAlignment().getHiddenColumns()
+                            .getNextHiddenBoundary(false, startres)))
             {
               endEditing();
               return;