Fix various missing horizontal scroll handlers causing bleed through to widgets below

Author: RyeMutt

indra/llui/llaccordionctrl.cpp

@@ -545,6 +545,15 @@ bool LLAccordionCtrl::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
     return false;
 }
 
+bool LLAccordionCtrl::handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta)
+{
+    if (LLPanel::handleScrollHWheel(x, y, delta))
+        return true;
+    if (mScrollbar->getVisible() && mScrollbar->handleScrollHWheel(0, 0, delta))
+        return true;
+    return false;
+}
+
 bool LLAccordionCtrl::handleKeyHere(KEY key, MASK mask)
 {
     if (mScrollbar->getVisible() && mScrollbar->handleKeyHere(key, mask))

indra/llui/llaccordionctrl.h

@@ -92,6 +92,7 @@ class LLAccordionCtrl: public LLPanel
 
     virtual bool handleRightMouseDown   ( S32 x, S32 y, MASK mask);
     virtual bool handleScrollWheel      ( S32 x, S32 y, LLScrollDelta delta );
+    virtual bool handleScrollHWheel     ( S32 x, S32 y, LLScrollDelta delta );
     virtual bool handleKeyHere          (KEY key, MASK mask);
     virtual bool handleDragAndDrop      (S32 x, S32 y, MASK mask, bool drop,
                                          EDragAndDropType cargo_type,

indra/llui/llaccordionctrltab.cpp

@@ -1164,3 +1164,18 @@ bool LLAccordionCtrlTab::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
 
     return false;
 }
+
+bool LLAccordionCtrlTab::handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta)
+{
+    if (LLUICtrl::handleScrollHWheel(x, y, delta))
+    {
+        return true;
+    }
+
+    if (mScrollbar && mScrollbar->getVisible() && mScrollbar->handleScrollHWheel(0, 0, delta))
+    {
+        return true;
+    }
+
+    return false;
+}

indra/llui/llaccordionctrltab.h

@@ -169,7 +169,7 @@ class LLAccordionCtrlTab : public LLUICtrl
 
     virtual bool handleToolTip(S32 x, S32 y, MASK mask);
     virtual bool handleScrollWheel( S32 x, S32 y, LLScrollDelta delta );
-
+    virtual bool handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta);
 
     virtual bool addChild(LLView* child, S32 tab_group = 0 );
 

indra/llui/llfloater.cpp

@@ -1786,6 +1786,12 @@ bool LLFloater::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
     return true;//always
 }
 
+bool LLFloater::handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta)
+{
+    LLPanel::handleScrollHWheel(x, y, delta);
+    return true; // always
+}
+
 // virtual
 bool LLFloater::handleMouseUp(S32 x, S32 y, MASK mask)
 {

indra/llui/llfloater.h

@@ -330,6 +330,7 @@ class LLFloater : public LLPanel, public LLInstanceTracker<LLFloater>
     virtual bool    handleMiddleMouseDown(S32 x, S32 y, MASK mask);
 
     virtual bool    handleScrollWheel(S32 x, S32 y, LLScrollDelta delta);
+    virtual bool    handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta);
 
     virtual void    draw();
     virtual void    drawShadow(LLPanel* panel);

indra/llui/llmodaldialog.cpp

@@ -249,6 +249,12 @@ bool LLModalDialog::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
     return true;
 }
 
+bool LLModalDialog::handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta)
+{
+    childrenHandleScrollHWheel(x, y, delta);
+    return true;
+}
+
 bool LLModalDialog::handleDoubleClick(S32 x, S32 y, MASK mask)
 {
     if (!LLFloater::handleDoubleClick(x, y, mask))

indra/llui/llmodaldialog.h

@@ -53,6 +53,7 @@ class LLModalDialog : public LLFloater
     /*virtual*/ bool    handleMouseUp(S32 x, S32 y, MASK mask);
     /*virtual*/ bool    handleHover(S32 x, S32 y, MASK mask);
     /*virtual*/ bool    handleScrollWheel(S32 x, S32 y, LLScrollDelta delta);
+    /*virtual*/ bool    handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta);
     /*virtual*/ bool    handleDoubleClick(S32 x, S32 y, MASK mask);
     /*virtual*/ bool    handleRightMouseDown(S32 x, S32 y, MASK mask);
     /*virtual*/ bool    handleKeyHere(KEY key, MASK mask );

indra/llui/lltextbase.cpp

@@ -1480,6 +1480,18 @@ bool LLTextBase::handleScrollWheel(S32 x, S32 y, LLScrollDelta delta)
     return LLUICtrl::handleScrollWheel(x, y, delta);
 }
 
+// virtual
+bool LLTextBase::handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta)
+{
+    LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
+    if (cur_segment && cur_segment->handleScrollHWheel(x, y, delta))
+    {
+        return true;
+    }
+
+    return LLUICtrl::handleScrollHWheel(x, y, delta);
+}
+
 //virtual
 bool LLTextBase::handleToolTip(S32 x, S32 y, MASK mask)
 {

indra/llui/lltextbase.h

@@ -392,6 +392,7 @@ class LLTextBase
     /*virtual*/ bool        handleDoubleClick(S32 x, S32 y, MASK mask) override;
     /*virtual*/ bool        handleHover(S32 x, S32 y, MASK mask) override;
     /*virtual*/ bool        handleScrollWheel(S32 x, S32 y, LLScrollDelta delta) override;
+    /*virtual*/ bool        handleScrollHWheel(S32 x, S32 y, LLScrollDelta delta) override;
     /*virtual*/ bool        handleToolTip(S32 x, S32 y, MASK mask) override;
 
     // LLView interface