From 1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Fri, 8 Jan 2010 17:02:56 +0100 Subject: Slider widgets can now be controlled with mouse wheel. (Cherry-picked by Jacek from 334b0b32) --- linden/indra/llui/llslider.cpp | 6 ++++++ linden/indra/llui/llslider.h | 1 + 2 files changed, 7 insertions(+) (limited to 'linden') diff --git a/linden/indra/llui/llslider.cpp b/linden/indra/llui/llslider.cpp index 7b4da9b..83b4d65 100644 --- a/linden/indra/llui/llslider.cpp +++ b/linden/indra/llui/llslider.cpp @@ -222,6 +222,12 @@ BOOL LLSlider::handleMouseDown(S32 x, S32 y, MASK mask) return TRUE; } +BOOL LLSlider::handleScrollWheel(S32 x, S32 y, S32 clicks) +{ + setValueAndCommit(getValueF32() - ( getIncrement()* (F32)clicks )); + return TRUE; +} + BOOL LLSlider::handleKeyHere(KEY key, MASK mask) { BOOL handled = FALSE; diff --git a/linden/indra/llui/llslider.h b/linden/indra/llui/llslider.h index 154685f..9fc85f2 100644 --- a/linden/indra/llui/llslider.h +++ b/linden/indra/llui/llslider.h @@ -78,6 +78,7 @@ public: virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks); virtual BOOL handleKeyHere(KEY key, MASK mask); virtual void draw(); -- cgit v1.1