From 866e8d07117edfe3fbc9bbf4f27ca8875f17bcba Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 24 Jun 2017 15:22:29 +0200 Subject: [PATCH] Fix #149 GUI scrollbar working differently --- .../core/craftgui/controls/scroll/ControlScrollBar.java | 8 ++++---- .../controls/scroll/ControlScrollableContent.java | 2 +- .../java/binnie/core/craftgui/minecraft/GuiCraftGUI.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java index 5e6c8b62..103b0fa9 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollBar.java @@ -25,7 +25,7 @@ public class ControlScrollBar extends Control { this.addSelfEventHandler(new EventMouse.Drag.Handler() { @Override public void onEvent(final EventMouse.Drag event) { - ControlScrollBar.this.scrollable.movePercentage(event.getDy() / (ControlScrollBar.this.height() - ControlScrollBar.this.getBarHeight())); + ControlScrollBar.this.scrollable.movePercentage(event.getDy() / (float) (ControlScrollBar.this.height() - ControlScrollBar.this.getBarHeight())); } }); this.addSelfEventHandler(new EventMouse.Down.Handler() { @@ -35,13 +35,13 @@ public class ControlScrollBar extends Control { final float percentageIndex = ControlScrollBar.this.scrollable.getPercentageIndex(); final float minPercent = (1.0f - shownPercentage) * percentageIndex; final float maxPercent = minPercent + shownPercentage; - float clickedPercentage = ControlScrollBar.this.getRelativeMousePosition().y() / (ControlScrollBar.this.height() - 2.0f); + float clickedPercentage = (float)ControlScrollBar.this.getRelativeMousePosition().y() / (float) (ControlScrollBar.this.height() - 2.0f); clickedPercentage = Math.max(Math.min(clickedPercentage, 1.0f), 0.0f); if (clickedPercentage > maxPercent) { - ControlScrollBar.this.scrollable.setPercentageIndex((clickedPercentage - shownPercentage) / (1.0f - shownPercentage)); + ControlScrollBar.this.scrollable.setPercentageIndex((float) (clickedPercentage - shownPercentage) / (float) (1.0f - shownPercentage)); } if (clickedPercentage < minPercent) { - ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (1.0f - shownPercentage)); + ControlScrollBar.this.scrollable.setPercentageIndex(clickedPercentage / (float) (1.0f - shownPercentage)); } } }); diff --git a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java index 6eb42f65..316ea07a 100644 --- a/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java +++ b/src/main/java/binnie/core/craftgui/controls/scroll/ControlScrollableContent.java @@ -65,7 +65,7 @@ public class ControlScrollableContent extends Control impleme if (this.controlChild == null || this.controlChild.getSize().y() == 0) { return 1; } - final float shown = this.getSize().y() / this.controlChild.getSize().y(); + float shown = (float)this.getSize().y() / (float) this.controlChild.getSize().y(); return Math.min(shown, 1); } diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index 94b83121..d568be93 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -252,7 +252,7 @@ public class GuiCraftGUI extends GuiContainer { //@Override protected void mouseMovedOrUp(final int x, final int y, final int button) { final IWidget origin = (this.window.getMousedOverWidget() == null) ? this.window : this.window.getMousedOverWidget(); - if (button == -1) { + if (button == 0) { final float dx = Mouse.getEventDX() * this.width / (float) this.mc.displayWidth; final float dy = -(Mouse.getEventDY() * this.height / (float) this.mc.displayHeight); } else {