From a839cc9f49f809e73e8ad214f39adf61a2f7b73c Mon Sep 17 00:00:00 2001 From: minjaesong Date: Wed, 31 Jan 2024 16:40:05 +0900 Subject: [PATCH] item list only wheel-scrolls when you move whell on the navbar --- .../modulebasegame/ui/UIItemInventoryItemGrid.kt | 8 +++++--- .../modulebasegame/ui/UIItemListNavBarVertical.kt | 13 +++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt index a596ba0cd..2faa12223 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemInventoryItemGrid.kt @@ -603,11 +603,13 @@ open class UIItemInventoryItemGrid( super.scrolled(amountX, amountY) items.forEach { if (it.mouseUp) it.scrolled(amountX, amountY) } + navRemoCon.scrolled(amountX, amountY) // scroll the item list (for now) - if (mouseUp) { - scrollItemPage(amountY.toInt()) - } + // commented out -- this clashes with the wheelFun +// if (mouseUp) { +// scrollItemPage(amountY.toInt()) +// } return true } diff --git a/src/net/torvald/terrarum/modulebasegame/ui/UIItemListNavBarVertical.kt b/src/net/torvald/terrarum/modulebasegame/ui/UIItemListNavBarVertical.kt index 4e6670797..039814c96 100644 --- a/src/net/torvald/terrarum/modulebasegame/ui/UIItemListNavBarVertical.kt +++ b/src/net/torvald/terrarum/modulebasegame/ui/UIItemListNavBarVertical.kt @@ -177,6 +177,19 @@ class UIItemListNavBarVertical( return super.touchDown(screenX, screenY, pointer, button) } + override fun scrolled(amountX: Float, amountY: Float): Boolean { + if (mouseUp && amountY > 0f) { + scrollDownListener.invoke(this, scrollDownButton) + return true + } + else if (mouseUp && amountY < 0f) { + scrollUpListener.invoke(this, scrollUpButton) + return true + } + + return false + } + override fun dispose() { }