1 files changed, 126 insertions, 15 deletions

diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 4687414..db09717 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2001-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -476,6 +477,24 @@ void LLTabContainerCommon::onPrevBtn( void* userdata )
         self->mScrolled = FALSE;
 }
 
+
+void LLTabContainerCommon::onJumpFirstBtn( void* userdata )
+{
+        LLTabContainer* self = (LLTabContainer*) userdata;
+        
+        self->mScrollPos = 0;
+
+}
+
+
+void LLTabContainerCommon::onJumpLastBtn( void* userdata )
+{
+        LLTabContainer* self = (LLTabContainer*) userdata;
+
+        self->mScrollPos = self->mMaxScrollPos;
+}
+
+
 // static 
 void LLTabContainerCommon::onPrevBtnHeld( void* userdata )
 {
@@ -692,6 +711,8 @@ LLTabContainer::LLTabContainer(
         LLTabContainerCommon(name, rect, pos, close_callback, callback_userdata, bordered),
         mLeftArrowBtn(NULL),
         mRightArrowBtn(NULL),
+        mJumpLeftArrowBtn(NULL),
+        mJumpRightArrowBtn(NULL),
         mRightTabBtnOffset(0),
         mMinTabWidth(TABCNTR_TAB_MIN_WIDTH),
         mMaxTabWidth(TABCNTR_TAB_MAX_WIDTH),
@@ -708,6 +729,8 @@ LLTabContainer::LLTabContainer(
         LLTabContainerCommon(name, rect_control, pos, close_callback, callback_userdata, bordered),
         mLeftArrowBtn(NULL),
         mRightArrowBtn(NULL),
+        mJumpLeftArrowBtn(NULL),
+        mJumpRightArrowBtn(NULL),
         mRightTabBtnOffset(0),
         mMinTabWidth(TABCNTR_TAB_MIN_WIDTH),
         mMaxTabWidth(TABCNTR_TAB_MAX_WIDTH),
@@ -739,14 +762,35 @@ void LLTabContainer::initButtons()
         S32 btn_top = (mTabPosition == TOP ) ? mRect.getHeight() - mTopBorderHeight : TABCNTR_ARROW_BTN_SIZE + 1;
 
         LLRect left_arrow_btn_rect;
-        left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1, btn_top + arrow_fudge, TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+        left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1+TABCNTR_ARROW_BTN_SIZE, btn_top + arrow_fudge, TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+
+        LLRect jump_left_arrow_btn_rect;
+        jump_left_arrow_btn_rect.setLeftTopAndSize( LLPANEL_BORDER_WIDTH+1, btn_top + arrow_fudge, TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
 
         S32 right_pad = TABCNTR_ARROW_BTN_SIZE + LLPANEL_BORDER_WIDTH + 1;
+
         LLRect right_arrow_btn_rect;
-        right_arrow_btn_rect.setLeftTopAndSize( mRect.getWidth() - mRightTabBtnOffset - right_pad,
+        right_arrow_btn_rect.setLeftTopAndSize( mRect.getWidth() - mRightTabBtnOffset - right_pad - TABCNTR_ARROW_BTN_SIZE,
                                                                                         btn_top + arrow_fudge,
                                                                                         TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
 
+
+        LLRect jump_right_arrow_btn_rect;
+        jump_right_arrow_btn_rect.setLeftTopAndSize( mRect.getWidth() - mRightTabBtnOffset - right_pad,
+                                                                                        btn_top + arrow_fudge,
+                                                                                        TABCNTR_ARROW_BTN_SIZE, TABCNTR_ARROW_BTN_SIZE );
+
+        out_id = "UIImgBtnJumpLeftOutUUID";
+        in_id = "UIImgBtnJumpLeftInUUID";
+        mJumpLeftArrowBtn = new LLButton(
+                "Jump Left Arrow", jump_left_arrow_btn_rect,
+                out_id, in_id, "",
+                &LLTabContainer::onJumpFirstBtn, this, LLFontGL::sSansSerif );
+        mJumpLeftArrowBtn->setFollowsLeft();
+        mJumpLeftArrowBtn->setSaveToXML(false);
+        mJumpLeftArrowBtn->setTabStop(FALSE);
+        addChild(mJumpLeftArrowBtn);
+
         out_id = "UIImgBtnScrollLeftOutUUID";
         in_id = "UIImgBtnScrollLeftInUUID";
         mLeftArrowBtn = new LLButton(
@@ -758,6 +802,18 @@ void LLTabContainer::initButtons()
         mLeftArrowBtn->setSaveToXML(false);
         mLeftArrowBtn->setTabStop(FALSE);
         addChild(mLeftArrowBtn);
+        
+        out_id = "UIImgBtnJumpRightOutUUID";
+        in_id = "UIImgBtnJumpRightInUUID";
+        mJumpRightArrowBtn = new LLButton(
+                "Jump Right Arrow", jump_right_arrow_btn_rect,
+                out_id, in_id, "",
+                &LLTabContainer::onJumpLastBtn, this,
+                LLFontGL::sSansSerif);
+        mJumpRightArrowBtn->setFollowsRight();
+        mJumpRightArrowBtn->setSaveToXML(false);
+        mJumpRightArrowBtn->setTabStop(FALSE);
+        addChild(mJumpRightArrowBtn);
 
         out_id = "UIImgBtnScrollRightOutUUID";
         in_id = "UIImgBtnScrollRightInUUID";
@@ -772,15 +828,20 @@ void LLTabContainer::initButtons()
         mRightArrowBtn->setTabStop(FALSE);
         addChild(mRightArrowBtn);
 
+
         if( mTabPosition == TOP )
         {
                 mRightArrowBtn->setFollowsTop();
                 mLeftArrowBtn->setFollowsTop();
+                mJumpLeftArrowBtn->setFollowsTop();
+                mJumpRightArrowBtn->setFollowsTop();
         }
         else
         {
                 mRightArrowBtn->setFollowsBottom();
                 mLeftArrowBtn->setFollowsBottom();
+                mJumpLeftArrowBtn->setFollowsBottom();
+                mJumpRightArrowBtn->setFollowsBottom();
         }
 
         // set default tab group to be panel contents
@@ -971,7 +1032,7 @@ void LLTabContainer::updateMaxScrollPos()
 
         if( tab_space > available_space )
         {
-                S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + 1);
+                S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE  + TABCNTR_ARROW_BTN_SIZE + 1);
                 // subtract off reserved portion on left
                 available_width_with_arrows -= TABCNTR_TAB_PARTIAL_WIDTH;
 
@@ -1002,7 +1063,7 @@ void LLTabContainer::updateMaxScrollPos()
 
 void LLTabContainer::commitHoveredButton(S32 x, S32 y)
 {
-        if (gFocusMgr.getMouseCapture() == this)
+        if (hasMouseCapture())
         {
                 for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
                 {
@@ -1078,7 +1139,7 @@ BOOL LLTabContainer::selectTab(S32 which)
                                 }
                                 else
                                 {
-                                        S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + 1);
+                                        S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE  + TABCNTR_ARROW_BTN_SIZE + 1);
                                         S32 running_tab_width = tuple->mButton->getRect().getWidth();
                                         S32 j = i - 1;
                                         S32 min_scroll_pos = i;
@@ -1120,7 +1181,7 @@ void LLTabContainer::draw()
         S32 cur_scroll_pos = mScrollPos;
         if (cur_scroll_pos > 0)
         {
-                S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE + 1);
+                S32 available_width_with_arrows = mRect.getWidth() - mRightTabBtnOffset - 2 * (LLPANEL_BORDER_WIDTH + TABCNTR_ARROW_BTN_SIZE  + TABCNTR_ARROW_BTN_SIZE + 1);
                 for(tuple_list_t::iterator iter = mTabList.begin(); iter != mTabList.end(); ++iter)
                 {
                         if (cur_scroll_pos == 0)
@@ -1141,11 +1202,13 @@ void LLTabContainer::draw()
         if( getVisible() )
         {
                 BOOL has_scroll_arrows = (mMaxScrollPos > 0) || (mScrollPosPixels > 0);
+                mJumpLeftArrowBtn->setVisible( has_scroll_arrows );
+                mJumpRightArrowBtn->setVisible( has_scroll_arrows );
                 mLeftArrowBtn->setVisible( has_scroll_arrows );
                 mRightArrowBtn->setVisible( has_scroll_arrows );
 
                 // Set the leftmost position of the tab buttons.
-                S32 left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? TABCNTR_ARROW_BTN_SIZE : TABCNTR_TAB_H_PAD);
+                S32 left = LLPANEL_BORDER_WIDTH + (has_scroll_arrows ? (TABCNTR_ARROW_BTN_SIZE * 2) : TABCNTR_TAB_H_PAD);
                 left -= mScrollPosPixels;
 
                 // Hide all the buttons
@@ -1234,7 +1297,19 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
         BOOL has_scroll_arrows = (mMaxScrollPos > 0);
 
         if (has_scroll_arrows)
-        {
+        {               
+                if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32 local_x = x - mJumpLeftArrowBtn->getRect().mLeft;
+                        S32 local_y = y - mJumpLeftArrowBtn->getRect().mBottom;
+                        handled = mJumpLeftArrowBtn->handleMouseDown(local_x, local_y, mask);
+                }
+                if (mJumpRightArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32 local_x = x - mJumpRightArrowBtn->getRect().mLeft;
+                        S32 local_y = y - mJumpRightArrowBtn->getRect().mBottom;
+                        handled = mJumpRightArrowBtn->handleMouseDown(local_x, local_y, mask);
+                }
                 if (mLeftArrowBtn->getRect().pointInRect(x, y))
                 {
                         S32 local_x = x - mLeftArrowBtn->getRect().mLeft;
@@ -1256,14 +1331,14 @@ BOOL LLTabContainer::handleMouseDown( S32 x, S32 y, MASK mask )
         if (mTabList.size() > 0)
         {
                 LLTabTuple* firsttuple = mTabList[0];
-                LLRect tab_rect(has_scroll_arrows ? mLeftArrowBtn->getRect().mRight : mLeftArrowBtn->getRect().mLeft,
+                LLRect tab_rect(has_scroll_arrows ? mLeftArrowBtn->getRect().mRight : mJumpLeftArrowBtn->getRect().mLeft,
                                                 firsttuple->mButton->getRect().mTop,
-                                                has_scroll_arrows ? mRightArrowBtn->getRect().mLeft : mRightArrowBtn->getRect().mRight,
+                                                has_scroll_arrows ? mRightArrowBtn->getRect().mLeft : mJumpRightArrowBtn->getRect().mRight,
                                                 firsttuple->mButton->getRect().mBottom );
                 if( tab_rect.pointInRect( x, y ) )
                 {
                         LLButton* tab_button = mTabList[getCurrentPanelIndex()]->mButton;
-                        gFocusMgr.setMouseCapture(this, NULL);
+                        gFocusMgr.setMouseCapture(this);
                         gFocusMgr.setKeyboardFocus(tab_button, NULL);
                 }
         }
@@ -1276,7 +1351,19 @@ BOOL LLTabContainer::handleHover( S32 x, S32 y, MASK mask )
         BOOL has_scroll_arrows = (mMaxScrollPos > 0);
 
         if (has_scroll_arrows)
-        {
+        {               
+                if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32 local_x = x - mJumpLeftArrowBtn->getRect().mLeft;
+                        S32 local_y = y - mJumpLeftArrowBtn->getRect().mBottom;
+                        handled = mJumpLeftArrowBtn->handleHover(local_x, local_y, mask);
+                }
+                if (mJumpRightArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32 local_x = x - mJumpRightArrowBtn->getRect().mLeft;
+                        S32 local_y = y - mJumpRightArrowBtn->getRect().mBottom;
+                        handled = mJumpRightArrowBtn->handleHover(local_x, local_y, mask);
+                }
                 if (mLeftArrowBtn->getRect().pointInRect(x, y))
                 {
                         S32 local_x = x - mLeftArrowBtn->getRect().mLeft;
@@ -1306,6 +1393,18 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 
         if (has_scroll_arrows)
         {
+                if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32 local_x = x - mJumpLeftArrowBtn->getRect().mLeft;
+                        S32 local_y = y - mJumpLeftArrowBtn->getRect().mBottom;
+                        handled = mJumpLeftArrowBtn->handleMouseUp(local_x, local_y, mask);
+                }               
+                if (mJumpRightArrowBtn->getRect().pointInRect(x,        y))
+                {
+                        S32     local_x = x     - mJumpRightArrowBtn->getRect().mLeft;
+                        S32     local_y = y     - mJumpRightArrowBtn->getRect().mBottom;
+                        handled = mJumpRightArrowBtn->handleMouseUp(local_x,    local_y, mask);
+                }
                 if (mLeftArrowBtn->getRect().pointInRect(x, y))
                 {
                         S32 local_x = x - mLeftArrowBtn->getRect().mLeft;
@@ -1326,7 +1425,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 
         commitHoveredButton(x, y);
         LLPanel* cur_panel = getCurrentPanel();
-        if (gFocusMgr.getMouseCapture() == this)
+        if (hasMouseCapture())
         {
                 if (cur_panel)
                 {
@@ -1337,7 +1436,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
                                 mTabList[getCurrentPanelIndex()]->mButton->setFocus(TRUE);
                         }
                 }
-                gFocusMgr.setMouseCapture(NULL, NULL);
+                gFocusMgr.setMouseCapture(NULL);
         }
         return handled;
 }
@@ -1351,7 +1450,7 @@ BOOL LLTabContainer::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_
 
                 BOOL has_scroll_arrows = (mMaxScrollPos > 0);
                 LLRect clip(
-                        has_scroll_arrows ? mLeftArrowBtn->getRect().mRight : mLeftArrowBtn->getRect().mLeft,
+                        has_scroll_arrows ? mJumpLeftArrowBtn->getRect().mRight : mJumpLeftArrowBtn->getRect().mLeft,
                         firsttuple->mButton->getRect().mTop,
                         has_scroll_arrows ? mRightArrowBtn->getRect().mLeft : mRightArrowBtn->getRect().mRight,
                         0 );
@@ -1457,6 +1556,18 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 
         if (has_scroll_arrows)
         {
+                if (mJumpLeftArrowBtn->getRect().pointInRect(x, y))
+                {
+                        S32     local_x = x     - mJumpLeftArrowBtn->getRect().mLeft;
+                        S32     local_y = y     - mJumpLeftArrowBtn->getRect().mBottom;
+                        mJumpLeftArrowBtn->handleHover(local_x, local_y, mask);
+                }
+                if (mJumpRightArrowBtn->getRect().pointInRect(x,        y))
+                {
+                        S32     local_x = x     - mJumpRightArrowBtn->getRect().mLeft;
+                        S32     local_y = y     - mJumpRightArrowBtn->getRect().mBottom;
+                        mJumpRightArrowBtn->handleHover(local_x,        local_y, mask);
+                }
                 if (mLeftArrowBtn->getRect().pointInRect(x,     y))
                 {
                         S32     local_x = x     - mLeftArrowBtn->getRect().mLeft;