Fix scroll bar drag click (#608)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
GTNewHorizons · Nov 17, 2024 · 9146056 · 9146056
1 parent 4b4dad3
commit 9146056
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/appeng/client/gui/AEBaseGui.java b/src/main/java/appeng/client/gui/AEBaseGui.java
@@ -383,7 +383,7 @@ protected void mouseClickMove(final int x, final int y, final int c, final long
         final ItemStack itemstack = this.mc.thePlayer.inventory.getItemStack();
 
         if (this.getScrollBar() != null) {
-            this.getScrollBar().click(this, x - this.guiLeft, y - this.guiTop);
+            this.getScrollBar().clickMove(y - this.guiTop);
         }
 
         if (slot instanceof SlotFake && itemstack != null) {

diff --git a/src/main/java/appeng/client/gui/implementations/GuiPatternTermEx.java b/src/main/java/appeng/client/gui/implementations/GuiPatternTermEx.java
@@ -232,7 +232,7 @@ protected void mouseClicked(final int xCoord, final int yCoord, final int btn) {
     @Override
     protected void mouseClickMove(final int x, final int y, final int c, final long d) {
         final int currentScroll = this.processingScrollBar.getCurrentScroll();
-        this.processingScrollBar.click(this, x - this.guiLeft, y - this.guiTop);
+        this.processingScrollBar.clickMove(y - this.guiTop);
         super.mouseClickMove(x, y, c, d);
 
         if (currentScroll != this.processingScrollBar.getCurrentScroll()) {

diff --git a/src/main/java/appeng/client/gui/widgets/GuiCraftingCPUTable.java b/src/main/java/appeng/client/gui/widgets/GuiCraftingCPUTable.java
@@ -294,7 +294,7 @@ public void sendCPUSwitch(int serial) {
      */
     public void mouseClickMove(int xCoord, int yCoord) {
         if (cpuScrollbar != null) {
-            cpuScrollbar.click(parent, xCoord, yCoord);
+            cpuScrollbar.clickMove(yCoord);
         }
     }
 

diff --git a/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java b/src/main/java/appeng/client/gui/widgets/GuiScrollbar.java
@@ -31,6 +31,7 @@ public class GuiScrollbar implements IScrollSource {
     private int minScroll = 0;
     private int currentScroll = 0;
     private boolean visible = true;
+    private boolean isLatestClickOnScrollbar;
 
     public void setTexture(final String base, final String file, final int shiftX, final int shiftY) {
         txtBase = base;
@@ -133,12 +134,26 @@ public void click(final AEBaseGui aeBaseGui, final int x, final int y) {
         if (this.getRange() == 0) {
             return;
         }
-
         if (this.contains(x, y)) {
             this.currentScroll = (y - this.displayY);
             this.currentScroll = this.minScroll + ((this.currentScroll * 2 * this.getRange() / this.height));
             this.currentScroll = (this.currentScroll + 1) >> 1;
             this.applyRange();
+            isLatestClickOnScrollbar = true;
+        } else {
+            isLatestClickOnScrollbar = false;
+        }
+    }
+
+    public void clickMove(final int y) {
+        if (this.getRange() == 0 || !isLatestClickOnScrollbar) {
+            return;
+        }
+        if (y >= this.displayY && y <= this.displayY + this.height) {
+            this.currentScroll = (y - this.displayY);
+            this.currentScroll = this.minScroll + ((this.currentScroll * 2 * this.getRange() / this.height));
+            this.currentScroll = (this.currentScroll + 1) >> 1;
+            this.applyRange();
         }
     }