From 2ada93db9c2201bd6b8b6f7f1621ff41ebb98aca Mon Sep 17 00:00:00 2001 From: BenDol Date: Sun, 13 Jul 2014 02:08:33 +1200 Subject: [PATCH] Should use the set minimum for these! --- modules/corelib/ui/uiscrollarea.lua | 6 ++++-- modules/corelib/ui/uiscrollbar.lua | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/corelib/ui/uiscrollarea.lua b/modules/corelib/ui/uiscrollarea.lua index b15125ca..2c27416a 100644 --- a/modules/corelib/ui/uiscrollarea.lua +++ b/modules/corelib/ui/uiscrollarea.lua @@ -111,7 +111,8 @@ function UIScrollArea:onMouseWheel(mousePos, mouseWheel) return false end if mouseWheel == MouseWheelUp then - if self.verticalScrollBar:getValue() < 1 then + local minimum = self.verticalScrollBar:getMinimum() + if self.verticalScrollBar:getValue() < minimum then return false end self.verticalScrollBar:decrement() @@ -133,7 +134,8 @@ function UIScrollArea:onMouseWheel(mousePos, mouseWheel) end self.horizontalScrollBar:increment() else - if self.horizontalScrollBar:getValue() < 1 then + local minimum = self.horizontalScrollBar:getMinimum() + if self.horizontalScrollBar:getValue() < minimum then return false end self.horizontalScrollBar:decrement() diff --git a/modules/corelib/ui/uiscrollbar.lua b/modules/corelib/ui/uiscrollbar.lua index 67695b7e..c7ada55f 100644 --- a/modules/corelib/ui/uiscrollbar.lua +++ b/modules/corelib/ui/uiscrollbar.lua @@ -239,7 +239,7 @@ function UIScrollBar:onMouseWheel(mousePos, mouseWheel) end if mouseWheel == MouseWheelUp then if self.orientation == 'vertical' then - if self.value < 1 then return false end + if self.value <= self.minimum then return false end self:decrement() else if self.value >= self.maximum then return false end @@ -250,7 +250,7 @@ function UIScrollBar:onMouseWheel(mousePos, mouseWheel) if self.value >= self.maximum then return false end self:increment() else - if self.value < 1 then return false end + if self.value <= self.minimum then return false end self:decrement() end end