Make horizontal scrolling using the scrollwheel work again (#27)

GTNewHorizons · Jun 23, 2023 · b81e7cd · b81e7cd
1 parent 7d99f5e
commit b81e7cd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 16 deletions.
diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/api/diagram/DiagramGroup.java b/src/main/java/com/github/dcysteine/neicustomdiagram/api/diagram/DiagramGroup.java
@@ -198,7 +198,7 @@ public void drawTooltip(GuiRecipe<?> gui, int recipe) {
     }
 
     protected Optional<Interactable> findHoveredInteractable(int recipe) {
-        if (!mouseInBounds()) {
+        if (!mouseInDiagramBounds()) {
             return Optional.empty();
         }
 
@@ -212,8 +212,8 @@ protected Optional<Interactable> findHoveredInteractable(int recipe) {
         return Optional.empty();
     }
 
-    public boolean mouseInBounds() {
-        return scrollManager.mouseInBounds();
+    public boolean mouseInDiagramBounds() {
+        return scrollManager.mouseInDiagramBounds();
     }
 
     public boolean interact(int recipe, Interactable.RecipeType recipeType) {
@@ -283,17 +283,16 @@ public boolean mouseClicked(GuiRecipe<?> gui, int button, int recipe) {
     public boolean mouseScrolled(GuiRecipe<?> gui, int scroll, int recipe) {
         ScrollDirection direction = scroll > 0 ? ScrollDirection.UP : ScrollDirection.DOWN;
 
-        if (mouseInBounds()) {
-            if (NEIClientUtils.shiftKey()) {
-                diagramState.scroll(direction);
-                return true;
-            }
-            if (!ConfigOptions.DISABLE_PAGE_SCROLL.get()) {
-                return scrollManager.mouseScroll(direction);
-            }
+        if (mouseInDiagramBounds() && NEIClientUtils.shiftKey()) {
+            diagramState.scroll(direction);
+            return true;
         }
 
-        return false;
+        if (scrollManager.mouseScroll(direction)) {
+            return true;
+        } else {
+            return mouseInDiagramBounds() && ConfigOptions.DISABLE_PAGE_SCROLL.get();
+        }
     }
 
     public Optional<ItemStack> getStackUnderMouse(int recipe) {

diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/api/draw/scroll/ScrollManager.java b/src/main/java/com/github/dcysteine/neicustomdiagram/api/draw/scroll/ScrollManager.java
@@ -42,7 +42,8 @@ public boolean keyboardScroll(Dimension diagramDimension, ScrollDirection direct
 
     public boolean mouseScroll(ScrollDirection direction) {
         // Horizontal scrolling is more rarely done, so we will scroll horizontally only if the
-        // mouse is directly over the horizontal scrollbar. Otherwise, we will default to vertical.
+        // mouse is directly over the horizontal scrollbar. Vertical scrolling is done either when
+        // the cursor is over the scrollbar or over the diagram itself.
         if (horizontalScrollbar.mouseInScrollBounds()) {
             ScrollDirection horizontalDirection;
             switch (direction) {
@@ -61,8 +62,10 @@ public boolean mouseScroll(ScrollDirection direction) {
                     break;
             }
             return horizontalScrollbar.scroll(horizontalDirection, ConfigOptions.MOUSE_SCROLL_SPEED.get());
-        } else {
+        } else if (verticalScrollbar.mouseInScrollBounds() || mouseInDiagramBounds()) {
             return verticalScrollbar.scroll(direction, ConfigOptions.MOUSE_SCROLL_SPEED.get());
+        } else {
+            return false;
         }
     }
 
@@ -75,7 +78,7 @@ public boolean mouseClickScrollbar(MouseButton button) {
         return handled;
     }
 
-    public boolean mouseInBounds() {
+    public boolean mouseInDiagramBounds() {
         Point mousePos = getAbsoluteMousePosition();
         Point viewportPos = getViewportPosition();
         int xDiff = mousePos.x() - viewportPos.x();

diff --git a/src/main/java/com/github/dcysteine/neicustomdiagram/main/NeiIntegration.java b/src/main/java/com/github/dcysteine/neicustomdiagram/main/NeiIntegration.java
@@ -76,7 +76,7 @@ public boolean objectUnderMouse(GuiContainer guiContainer, int mousex, int mouse
 
         @Override
         public boolean shouldShowTooltip(GuiContainer guiContainer) {
-            return getDiagramGroup(guiContainer).map(diagramGroup -> !diagramGroup.mouseInBounds()).orElse(true);
+            return getDiagramGroup(guiContainer).map(diagramGroup -> !diagramGroup.mouseInDiagramBounds()).orElse(true);
         }
     }