aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden
diff options
context:
space:
mode:
authorArmin Weatherwax2010-01-08 17:02:56 +0100
committerJacek Antonelli2010-02-03 22:43:03 -0600
commit1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3 (patch)
tree1b593dc6894a4945709658b67b5fc66c98fc40c6 /linden
parentRemoved pixbuf and pango from linux32 viewer_manifest. (diff)
downloadmeta-impy-1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3.zip
meta-impy-1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3.tar.gz
meta-impy-1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3.tar.bz2
meta-impy-1e802ab2b4a0f203f910daf892b50fbf6cf4a8b3.tar.xz
Slider widgets can now be controlled with mouse wheel.
(Cherry-picked by Jacek from 334b0b32)
Diffstat (limited to 'linden')
-rw-r--r--linden/indra/llui/llslider.cpp6
-rw-r--r--linden/indra/llui/llslider.h1
2 files changed, 7 insertions, 0 deletions
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)
222 return TRUE; 222 return TRUE;
223} 223}
224 224
225BOOL LLSlider::handleScrollWheel(S32 x, S32 y, S32 clicks)
226{
227 setValueAndCommit(getValueF32() - ( getIncrement()* (F32)clicks ));
228 return TRUE;
229}
230
225BOOL LLSlider::handleKeyHere(KEY key, MASK mask) 231BOOL LLSlider::handleKeyHere(KEY key, MASK mask)
226{ 232{
227 BOOL handled = FALSE; 233 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:
78 virtual BOOL handleHover(S32 x, S32 y, MASK mask); 78 virtual BOOL handleHover(S32 x, S32 y, MASK mask);
79 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); 79 virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
80 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); 80 virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
81 virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
81 virtual BOOL handleKeyHere(KEY key, MASK mask); 82 virtual BOOL handleKeyHere(KEY key, MASK mask);
82 virtual void draw(); 83 virtual void draw();
83 84