Add mouseWheel to control branch length in subboard

featurecat · Nov 1, 2019 · 614774a · 614774a
1 parent da93051
commit 614774a
Show file tree

Hide file tree

Showing 13 changed files with 183 additions and 25 deletions.
diff --git a/src/main/java/featurecat/lizzie/gui/BasicInfoPane.java b/src/main/java/featurecat/lizzie/gui/BasicInfoPane.java
@@ -9,6 +9,8 @@
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.image.BufferedImage;
 
 /** The window used to display the game. */
@@ -67,6 +69,20 @@ protected void paintComponent(Graphics g0) {
     // cleanup
     bsGraphics.dispose();
     //    bs.show();
+    addMouseMotionListener(
+        new MouseMotionListener() {
+          @Override
+          public void mouseMoved(MouseEvent e) {
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
+          }
+
+          @Override
+          public void mouseDragged(MouseEvent e) {
+            // TODO Auto-generated method stub
+          }
+        });
   }
 
   private void drawCaptured(Graphics2D g, int posX, int posY, int width, int height) {

diff --git a/src/main/java/featurecat/lizzie/gui/BoardPane.java b/src/main/java/featurecat/lizzie/gui/BoardPane.java
@@ -128,11 +128,15 @@ public void mouseExited(MouseEvent e) {
             onMouseExited(e.getX(), e.getY());
           }
         });
+
     addMouseMotionListener(
         new MouseMotionListener() {
           @Override
           public void mouseMoved(MouseEvent e) {
             onMouseMoved(e.getX(), e.getY());
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
           }
 
           @Override

diff --git a/src/main/java/featurecat/lizzie/gui/BoardRenderer.java b/src/main/java/featurecat/lizzie/gui/BoardRenderer.java
@@ -1757,6 +1757,9 @@ public boolean incrementDisplayedBranchLength(int n) {
       default:
         // force nonnegative
         displayedBranchLength = max(0, displayedBranchLength + n);
+        if (variation != null) {
+          displayedBranchLength = min(displayedBranchLength, variation.size() + 1);
+        } else displayedBranchLength = 0;
         return true;
     }
   }

diff --git a/src/main/java/featurecat/lizzie/gui/CommentPane.java b/src/main/java/featurecat/lizzie/gui/CommentPane.java
@@ -85,6 +85,20 @@ public void mouseClicked(MouseEvent e) {
     scrollPane.setViewportView(commentPane);
     setVisible(false);
 
+    commentPane.addMouseMotionListener(
+        new MouseMotionListener() {
+          @Override
+          public void mouseMoved(MouseEvent e) {
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
+          }
+
+          @Override
+          public void mouseDragged(MouseEvent e) {
+            // TODO Auto-generated method stub
+          }
+        });
     //    mouseMotionAdapter = new MouseMotionAdapter() {
     //      @Override
     //      public void mouseDragged(MouseEvent e) {

diff --git a/src/main/java/featurecat/lizzie/gui/Input.java b/src/main/java/featurecat/lizzie/gui/Input.java
@@ -565,6 +565,9 @@ public void mouseWheelMoved(MouseWheelEvent e) {
     if (Lizzie.frame.processCommentMouseWheelMoved(e)) {
       return;
     }
+    if (Lizzie.frame.processSubBoardMouseWheelMoved(e)) {
+      return;
+    }
     if (e.getWhen() - wheelWhen > 0) {
       wheelWhen = e.getWhen();
       if (Lizzie.board.inAnalysisMode()) Lizzie.board.toggleAnalysis();

diff --git a/src/main/java/featurecat/lizzie/gui/LizzieFrame.java b/src/main/java/featurecat/lizzie/gui/LizzieFrame.java
@@ -1245,7 +1245,7 @@ public void onMouseMoved(int x, int y) {
       }
     } else {
       if (subBoardRenderer.getIsMouseOverSub()) {
-        subBoardRenderer.setIsMouseOverSub(false);
+        Lizzie.frame.clearIsMouseOverSub();
         repaint();
       }
     }
@@ -1321,18 +1321,14 @@ private void autosaveMaybe() {
     }
   }
 
-  private void setDisplayedBranchLength(int n) {
-    boardRenderer.setDisplayedBranchLength(n);
-  }
-
   public void startRawBoard() {
     boolean onBranch = boardRenderer.isShowingBranch();
     int n = (onBranch ? 1 : BoardRenderer.SHOW_RAW_BOARD);
-    boardRenderer.setDisplayedBranchLength(n);
+    Utils.setDisplayedBranchLength(boardRenderer, n);
   }
 
   public void stopRawBoard() {
-    boardRenderer.setDisplayedBranchLength(BoardRenderer.SHOW_NORMAL_BOARD);
+    Utils.setDisplayedBranchLength(boardRenderer, BoardRenderer.SHOW_NORMAL_BOARD);
   }
 
   public boolean incrementDisplayedBranchLength(int n) {
@@ -1428,15 +1424,15 @@ public void run() {
             int secs = (int) (Lizzie.config.replayBranchIntervalSeconds * 1000);
             for (int i = 1; i < replaySteps + 1; i++) {
               if (!isReplayVariation) break;
-              setDisplayedBranchLength(i);
+              Utils.setDisplayedBranchLength(boardRenderer, i);
               repaint();
               try {
                 Thread.sleep(secs);
               } catch (InterruptedException e) {
                 e.printStackTrace();
               }
             }
-            boardRenderer.setDisplayedBranchLength(oriBranchLength);
+            Utils.setDisplayedBranchLength(boardRenderer, oriBranchLength);
             isReplayVariation = false;
             if (!Lizzie.leelaz.isPondering()) Lizzie.leelaz.togglePonder();
           }
@@ -1572,5 +1568,22 @@ public void clearBeforeMove() {
   @Override
   public void clearIsMouseOverSub() {
     // TODO Auto-generated method stub
+    subBoardRenderer.setIsMouseOverSub(false);
+    Utils.setDisplayedBranchLength(subBoardRenderer, -2);
+  }
+
+  public boolean processSubBoardMouseWheelMoved(MouseWheelEvent e) {
+    int x = e.getX();
+    int y = e.getY();
+    if (Lizzie.config.showSubBoard && subBoardRenderer.isInside(x, y)) {
+      if (e.getWheelRotation() > 0) {
+        Utils.doBranchSub(subBoardRenderer, 1);
+        repaint();
+      } else if (e.getWheelRotation() < 0) {
+        Utils.doBranchSub(subBoardRenderer, -1);
+        repaint();
+      }
+      return true;
+    } else return false;
   }
 }
diff --git a/src/main/java/featurecat/lizzie/gui/LizzieMain.java b/src/main/java/featurecat/lizzie/gui/LizzieMain.java
@@ -23,6 +23,8 @@
 import java.awt.TexturePaint;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
+import java.awt.event.MouseWheelEvent;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.awt.image.BufferedImage;
@@ -251,6 +253,21 @@ public void windowClosing(WindowEvent e) {
           }
         });
 
+    addMouseMotionListener(
+        new MouseMotionListener() {
+          @Override
+          public void mouseMoved(MouseEvent e) {
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
+          }
+
+          @Override
+          public void mouseDragged(MouseEvent e) {
+            // TODO Auto-generated method stub
+          }
+        });
+
     // Show the playouts in the title
     showPlayouts.scheduleAtFixedRate(
         new Runnable() {
@@ -765,4 +782,19 @@ public void clearIsMouseOverSub() {
     // TODO Auto-generated method stub
     subBoardPane.clearIsMouseOverSub();
   }
+
+  @Override
+  public boolean processSubBoardMouseWheelMoved(MouseWheelEvent e) {
+    // TODO Auto-generated method stub
+    if (Lizzie.config.showSubBoard) {
+      int x = e.getX();
+      int y = e.getY();
+      if (x >= subBoardPane.getX()
+          && x <= (subBoardPane.getX() + subBoardPane.getWidth())
+          && y >= subBoardPane.getY()
+          && y <= (subBoardPane.getY() + subBoardPane.getHeight())) {
+        return true;
+      } else return false;
+    } else return false;
+  }
 }
diff --git a/src/main/java/featurecat/lizzie/gui/LizziePane.java b/src/main/java/featurecat/lizzie/gui/LizziePane.java
@@ -14,7 +14,6 @@
 import java.awt.Window;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
@@ -106,14 +105,6 @@ public void mouseClicked(MouseEvent e) {
             Lizzie.frame.getFocus();
           }
         });
-
-    addMouseMotionListener(
-        new MouseMotionAdapter() {
-          @Override
-          public void mouseMoved(MouseEvent e) {
-            Lizzie.frame.clearIsMouseOverSub();
-          }
-        });
   }
 
   @Override

diff --git a/src/main/java/featurecat/lizzie/gui/MainFrame.java b/src/main/java/featurecat/lizzie/gui/MainFrame.java
@@ -391,4 +391,6 @@ public void toggleEstimateByZen() {
   public abstract void clearBeforeMove();
 
   public abstract void clearIsMouseOverSub();
+
+  public abstract boolean processSubBoardMouseWheelMoved(MouseWheelEvent e);
 }
diff --git a/src/main/java/featurecat/lizzie/gui/SubBoardPane.java b/src/main/java/featurecat/lizzie/gui/SubBoardPane.java
@@ -5,12 +5,15 @@
 
 import featurecat.lizzie.Lizzie;
 import featurecat.lizzie.rules.Board;
+import featurecat.lizzie.util.Utils;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseWheelEvent;
+import java.awt.event.MouseWheelListener;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
@@ -38,11 +41,19 @@ public SubBoardPane(LizzieMain owner) {
         new MouseAdapter() {
           @Override
           public void mouseClicked(MouseEvent e) {
-            if (e.getButton() == MouseEvent.BUTTON1) subBoardRenderer.increaseBestmoveIndexSub(1);
-            if (e.getButton() == MouseEvent.BUTTON3) subBoardRenderer.increaseBestmoveIndexSub(-1);
-            if (e.getButton() == MouseEvent.BUTTON2) Lizzie.config.toggleLargeSubBoard();
+            if (e.getButton() == MouseEvent.BUTTON1) {
+              subBoardRenderer.increaseBestmoveIndexSub(1);
+              repaint();
+            }
+            if (e.getButton() == MouseEvent.BUTTON3) {
+              subBoardRenderer.increaseBestmoveIndexSub(-1);
+              repaint();
+            }
+            if (e.getButton() == MouseEvent.BUTTON2) {
+              Lizzie.config.toggleLargeSubBoard();
+              owner.invalidLayout();
+            }
             subBoardRenderer.setClickedSub(true);
-            owner.invalidLayout();
           }
         });
 
@@ -52,7 +63,21 @@ public void mouseClicked(MouseEvent e) {
           public void mouseMoved(MouseEvent e) {
             if (!subBoardRenderer.getIsMouseOverSub()) {
               subBoardRenderer.setIsMouseOverSub(true);
-              owner.invalidLayout();
+              repaint();
+            }
+          }
+        });
+
+    addMouseWheelListener(
+        new MouseWheelListener() {
+          @Override
+          public void mouseWheelMoved(MouseWheelEvent e) {
+            if (e.getWheelRotation() > 0) {
+              Utils.doBranchSub(subBoardRenderer, 1);
+              repaint();
+            } else if (e.getWheelRotation() < 0) {
+              Utils.doBranchSub(subBoardRenderer, -1);
+              repaint();
             }
           }
         });
@@ -146,7 +171,16 @@ public void clearBeforeMove() {
   public void clearIsMouseOverSub() {
     if (subBoardRenderer.getIsMouseOverSub()) {
       subBoardRenderer.setIsMouseOverSub(false);
+      Utils.setDisplayedBranchLength(subBoardRenderer, -2);
       repaint();
     }
   }
+
+  public boolean processSubBoardMouseWheelMoved(MouseWheelEvent e) {
+    // TODO Auto-generated method stub
+    if (subBoardRenderer.isInside(e.getX(), e.getY())) {
+      return true;
+    }
+    return false;
+  }
 }
diff --git a/src/main/java/featurecat/lizzie/gui/VariationTreePane.java b/src/main/java/featurecat/lizzie/gui/VariationTreePane.java
@@ -8,6 +8,7 @@
 import java.awt.RenderingHints;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.awt.event.MouseMotionListener;
 import java.awt.image.BufferedImage;
 
 /** The window used to display the game. */
@@ -39,6 +40,21 @@ public void mouseClicked(MouseEvent e) {
             }
           }
         });
+
+    addMouseMotionListener(
+        new MouseMotionListener() {
+          @Override
+          public void mouseMoved(MouseEvent e) {
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
+          }
+
+          @Override
+          public void mouseDragged(MouseEvent e) {
+            // TODO Auto-generated method stub
+          }
+        });
   }
 
   private BufferedImage cachedImage;

diff --git a/src/main/java/featurecat/lizzie/gui/WinratePane.java b/src/main/java/featurecat/lizzie/gui/WinratePane.java
@@ -15,7 +15,7 @@
 import java.awt.Stroke;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
-import java.awt.event.MouseMotionAdapter;
+import java.awt.event.MouseMotionListener;
 import java.awt.image.BufferedImage;
 import java.util.Optional;
 
@@ -52,7 +52,14 @@ public void mouseClicked(MouseEvent e) {
         });
 
     addMouseMotionListener(
-        new MouseMotionAdapter() {
+        new MouseMotionListener() {
+          @Override
+          public void mouseMoved(MouseEvent e) {
+            if (Lizzie.config.showSubBoard) {
+              Lizzie.frame.clearIsMouseOverSub();
+            }
+          }
+
           @Override
           public void mouseDragged(MouseEvent e) {
             onMouseDragged(e.getX(), e.getY());