Second Life viewer sources 1.21.0-RC

1 files changed, 80 insertions, 61 deletions

diff --git a/linden/indra/llui/lltabcontainer.cpp b/linden/indra/llui/lltabcontainer.cpp
index 827d4fb..7bf1485 100644
--- a/linden/indra/llui/lltabcontainer.cpp
+++ b/linden/indra/llui/lltabcontainer.cpp
@@ -42,7 +42,6 @@
 #include "lltabcontainervertical.h"
 #include "llrender.h"
 
-
 const F32 SCROLL_STEP_TIME = 0.4f;
 const F32 SCROLL_DELAY_TIME = 0.5f;
 const S32 TAB_PADDING = 15;
@@ -66,7 +65,7 @@ const S32 TABCNTRV_PAD = 0;
 
 static LLRegisterWidget<LLTabContainer> r("tab_container");
 
-LLTabContainer::LLTabContainer(const LLString& name, const LLRect& rect, TabPosition pos,
+LLTabContainer::LLTabContainer(const std::string& name, const LLRect& rect, TabPosition pos,
                                                            BOOL bordered, BOOL is_vertical )
         : 
         LLPanel(name, rect, bordered),
@@ -122,7 +121,7 @@ void LLTabContainer::reshape(S32 width, S32 height, BOOL called_from_parent)
 }
 
 //virtual
-LLView* LLTabContainer::getChildView(const LLString& name, BOOL recurse, BOOL create_if_missing) const
+LLView* LLTabContainer::getChildView(const std::string& name, BOOL recurse, BOOL create_if_missing) const
 {
         tuple_list_t::const_iterator itor;
         for (itor = mTabList.begin(); itor != mTabList.end(); ++itor)
@@ -153,24 +152,43 @@ LLView* LLTabContainer::getChildView(const LLString& name, BOOL recurse, BOOL cr
 void LLTabContainer::draw()
 {
         S32 target_pixel_scroll = 0;
-        S32 cur_scroll_pos = mIsVertical ? 0 : getScrollPos();
+        S32 cur_scroll_pos = getScrollPos();
         if (cur_scroll_pos > 0)
         {
-                S32 available_width_with_arrows = getRect().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 (!mIsVertical)
                 {
-                        if (cur_scroll_pos == 0)
+                        S32 available_width_with_arrows = getRect().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)
                         {
-                                break;
+                                if (cur_scroll_pos == 0)
+                                {
+                                        break;
+                                }
+                                target_pixel_scroll += (*iter)->mButton->getRect().getWidth();
+                                cur_scroll_pos--;
                         }
-                        target_pixel_scroll += (*iter)->mButton->getRect().getWidth();
-                        cur_scroll_pos--;
-                }
 
-                // Show part of the tab to the left of what is fully visible
-                target_pixel_scroll -= TABCNTR_TAB_PARTIAL_WIDTH;
-                // clamp so that rightmost tab never leaves right side of screen
-                target_pixel_scroll = llmin(mTotalTabWidth - available_width_with_arrows, target_pixel_scroll);
+                        // Show part of the tab to the left of what is fully visible
+                        target_pixel_scroll -= TABCNTR_TAB_PARTIAL_WIDTH;
+                        // clamp so that rightmost tab never leaves right side of screen
+                        target_pixel_scroll = llmin(mTotalTabWidth - available_width_with_arrows, target_pixel_scroll);
+                }
+                else
+                {
+                        S32 available_height_with_arrows = getRect().getHeight() - getTopBorderHeight() - (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)
+                                {
+                                        break;
+                                }
+                                target_pixel_scroll += (*iter)->mButton->getRect().getHeight();
+                                cur_scroll_pos--;
+                        }
+                        S32 total_tab_height = (BTN_HEIGHT + TABCNTRV_PAD) * getTabCount() + TABCNTRV_PAD;
+                        // clamp so that the bottom tab never leaves bottom of panel
+                        target_pixel_scroll = llmin(total_tab_height - available_height_with_arrows, target_pixel_scroll);
+                }
         }
 
         setScrollPosPixels((S32)lerp((F32)getScrollPosPixels(), (F32)target_pixel_scroll, LLCriticalDamp::getInterpolant(0.08f)));
@@ -461,7 +479,7 @@ BOOL LLTabContainer::handleMouseUp( S32 x, S32 y, MASK mask )
 }
 
 // virtual
-BOOL LLTabContainer::handleToolTip( S32 x, S32 y, LLString& msg, LLRect* sticky_rect )
+BOOL LLTabContainer::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rect )
 {
         BOOL handled = LLPanel::handleToolTip( x, y, msg, sticky_rect );
         if (!handled && getTabCount() > 0) 
@@ -605,7 +623,7 @@ LLXMLNodePtr LLTabContainer::getXML(bool save_children) const
 }
 
 // virtual
-BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,      EDragAndDropType type, void* cargo_data, EAcceptance *accept, LLString  &tooltip)
+BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,      EDragAndDropType type, void* cargo_data, EAcceptance *accept, std::string       &tooltip)
 {
         BOOL has_scroll_arrows = (getMaxScrollPos() > 0);
 
@@ -613,13 +631,13 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
         {
                 if (has_scroll_arrows)
                 {
-                        if (mJumpPrevArrowBtn->getRect().pointInRect(x, y))
+                        if (mJumpPrevArrowBtn && mJumpPrevArrowBtn->getRect().pointInRect(x, y))
                         {
                                 S32     local_x = x     - mJumpPrevArrowBtn->getRect().mLeft;
                                 S32     local_y = y     - mJumpPrevArrowBtn->getRect().mBottom;
                                 mJumpPrevArrowBtn->handleHover(local_x, local_y, mask);
                         }
-                        if (mJumpNextArrowBtn->getRect().pointInRect(x, y))
+                        if (mJumpNextArrowBtn && mJumpNextArrowBtn->getRect().pointInRect(x, y))
                         {
                                 S32     local_x = x     - mJumpNextArrowBtn->getRect().mLeft;
                                 S32     local_y = y     - mJumpNextArrowBtn->getRect().mBottom;
@@ -657,7 +675,7 @@ BOOL LLTabContainer::handleDragAndDrop(S32 x, S32 y, MASK mask,	BOOL drop,	EDrag
 }
 
 void LLTabContainer::addTabPanel(LLPanel* child, 
-                                                                 const LLString& label, 
+                                                                 const std::string& label, 
                                                                  BOOL select, 
                                                                  void (*on_tab_clicked)(void*, bool), 
                                                                  void* userdata,
@@ -674,8 +692,8 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 
         // Store the original label for possible xml export.
         child->setLabel(label);
-        LLString trimmed_label = label;
-        LLString::trim(trimmed_label);
+        std::string trimmed_label = label;
+        LLStringUtil::trim(trimmed_label);
 
         S32 button_width = mMinTabWidth;
         if (!mIsVertical)
@@ -724,8 +742,8 @@ void LLTabContainer::addTabPanel(LLPanel* child,
 
         // Tab button
         LLRect btn_rect;  // Note: btn_rect.mLeft is just a dummy.  Will be updated in draw().
-        LLString tab_img;
-        LLString tab_selected_img;
+        std::string tab_img;
+        std::string tab_selected_img;
         S32 tab_fudge = 1;              //  To make new tab art look better, nudge buttons up 1 pel
 
         if (mIsVertical)
@@ -756,21 +774,21 @@ void LLTabContainer::addTabPanel(LLPanel* child,
                 btn_rect.translate(0, -LLBUTTON_V_PAD-2);
                 textbox = new LLTextBox(trimmed_label, btn_rect, trimmed_label, font);
                 
-                btn = new LLButton("", LLRect(0,0,0,0));
+                btn = new LLButton(LLStringUtil::null, LLRect(0,0,0,0));
         }
         else
         {
                 if (mIsVertical)
                 {
-                        btn = new LLButton("vert tab button",
+                        btn = new LLButton(std::string("vert tab button"),
                                                            btn_rect,
-                                                           "",
-                                                           "", 
-                                                           "", 
+                                                           LLStringUtil::null,
+                                                           LLStringUtil::null, 
+                                                           LLStringUtil::null, 
                                                            &LLTabContainer::onTabBtn, NULL,
                                                            font,
                                                            trimmed_label, trimmed_label);
-                        btn->setImages("tab_left.tga", "tab_left_selected.tga");
+                        btn->setImages(std::string("tab_left.tga"), std::string("tab_left_selected.tga"));
                         btn->setScaleImage(TRUE);
                         btn->setHAlign(LLFontGL::LEFT);
                         btn->setFollows(FOLLOWS_TOP | FOLLOWS_LEFT);
@@ -782,13 +800,13 @@ void LLTabContainer::addTabPanel(LLPanel* child,
                 }
                 else
                 {
-                        LLString tooltip = trimmed_label;
+                        std::string tooltip = trimmed_label;
                         tooltip += "\nAlt-Left arrow for previous tab";
                         tooltip += "\nAlt-Right arrow for next tab";
 
-                        btn = new LLButton(LLString(child->getName()) + " tab",
+                        btn = new LLButton(std::string(child->getName()) + " tab",
                                                            btn_rect, 
-                                                           "", "", "",
+                                                           LLStringUtil::null, LLStringUtil::null, LLStringUtil::null,
                                                            &LLTabContainer::onTabBtn, NULL, // set userdata below
                                                            font,
                                                            trimmed_label, trimmed_label );
@@ -845,7 +863,7 @@ void LLTabContainer::addTabPanel(LLPanel* child,
         updateMaxScrollPos();
 }
 
-void LLTabContainer::addPlaceholder(LLPanel* child, const LLString& label)
+void LLTabContainer::addPlaceholder(LLPanel* child, const std::string& label)
 {
         addTabPanel(child, label, FALSE, NULL, NULL, 0, TRUE);
 }
@@ -1012,7 +1030,7 @@ S32 LLTabContainer::getIndexForPanel(LLPanel* panel)
         return -1;
 }
 
-S32 LLTabContainer::getPanelIndexByTitle(const LLString& title)
+S32 LLTabContainer::getPanelIndexByTitle(const std::string& title)
 {
         for (S32 index = 0 ; index < (S32)mTabList.size(); index++)
         {
@@ -1024,7 +1042,7 @@ S32 LLTabContainer::getPanelIndexByTitle(const LLString& title)
         return -1;
 }
 
-LLPanel *LLTabContainer::getPanelByName(const LLString& name)
+LLPanel *LLTabContainer::getPanelByName(const std::string& name)
 {
         for (S32 index = 0 ; index < (S32)mTabList.size(); index++)
         {
@@ -1038,7 +1056,7 @@ LLPanel *LLTabContainer::getPanelByName(const LLString& name)
 }
 
 // Change the name of the button for the current tab.
-void LLTabContainer::setCurrentTabName(const LLString& name)
+void LLTabContainer::setCurrentTabName(const std::string& name)
 {
         // Might not have a tab selected
         if (mCurrentTabIdx < 0) return;
@@ -1212,7 +1230,7 @@ BOOL LLTabContainer::selectTab(S32 which)
         return is_visible;
 }
 
-BOOL LLTabContainer::selectTabByName(const LLString& name)
+BOOL LLTabContainer::selectTabByName(const std::string& name)
 {
         LLPanel* panel = getPanelByName(name);
         if (!panel)
@@ -1276,7 +1294,7 @@ void LLTabContainer::setTabImage(LLPanel* child, std::string image_name, const L
         }
 }
 
-void LLTabContainer::setTitle(const LLString& title)
+void LLTabContainer::setTitle(const std::string& title)
 {       
         if (mTitleBox)
         {
@@ -1284,14 +1302,14 @@ void LLTabContainer::setTitle(const LLString& title)
         }
 }
 
-const LLString LLTabContainer::getPanelTitle(S32 index)
+const std::string LLTabContainer::getPanelTitle(S32 index)
 {
         if (index >= 0 && index < (S32)mTabList.size())
         {
                 LLButton* tab_button = mTabList[index]->mButton;
                 return tab_button->getLabelSelected();
         }
-        return LLString::null;
+        return LLStringUtil::null;
 }
 
 void LLTabContainer::setTopBorderHeight(S32 height)
@@ -1329,7 +1347,7 @@ void LLTabContainer::setRightTabBtnOffset(S32 offset)
         updateMaxScrollPos();
 }
 
-void LLTabContainer::setPanelTitle(S32 index, const LLString& title)
+void LLTabContainer::setPanelTitle(S32 index, const std::string& title)
 {
         if (index >= 0 && index < getTabCount())
         {
@@ -1435,7 +1453,7 @@ void LLTabContainer::onPrevBtnHeld( void* userdata )
 // static
 LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory)
 {
-        LLString name("tab_container");
+        std::string name("tab_container");
         node->getAttributeString("name", name);
 
         // Figure out if we are creating a vertical or horizontal tab container.
@@ -1443,9 +1461,9 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
         LLTabContainer::TabPosition tab_position = LLTabContainer::TOP;
         if (node->hasAttribute("tab_position"))
         {
-                LLString tab_position_string;
+                std::string tab_position_string;
                 node->getAttributeString("tab_position", tab_position_string);
-                LLString::toLower(tab_position_string);
+                LLStringUtil::toLower(tab_position_string);
 
                 if ("top" == tab_position_string)
                 {
@@ -1507,7 +1525,7 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
                 if (control && control->isPanel())
                 {
                         LLPanel* panelp = (LLPanel*)control;
-                        LLString label;
+                        std::string label;
                         child->getAttributeString("label", label);
                         if (label.empty())
                         {
@@ -1515,7 +1533,7 @@ LLView* LLTabContainer::fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFacto
                         }
                         BOOL placeholder = FALSE;
                         child->getAttributeBOOL("placeholder", placeholder);
-                        tab_container->addTabPanel(panelp, label.c_str(), false,
+                        tab_container->addTabPanel(panelp, label, false,
                                                                            NULL, NULL, 0, placeholder);
                 }
         }
@@ -1539,8 +1557,8 @@ void LLTabContainer::initButtons()
                 return; // Don't have a rect yet or already got called
         }
         
-        LLString out_id;
-        LLString in_id;
+        std::string out_id;
+        std::string in_id;
 
         if (mIsVertical)
         {
@@ -1556,16 +1574,16 @@ void LLTabContainer::initButtons()
 
                 out_id = "UIImgBtnScrollUpOutUUID";
                 in_id = "UIImgBtnScrollUpInUUID";
-                mPrevArrowBtn = new LLButton("Up Arrow", up_arrow_btn_rect,
-                                                                         out_id, in_id, "",
+                mPrevArrowBtn = new LLButton(std::string("Up Arrow"), up_arrow_btn_rect,
+                                                                         out_id, in_id, LLStringUtil::null,
                                                                          &onPrevBtn, this, NULL );
                 mPrevArrowBtn->setFollowsTop();
                 mPrevArrowBtn->setFollowsLeft();
 
                 out_id = "UIImgBtnScrollDownOutUUID";
                 in_id = "UIImgBtnScrollDownInUUID";
-                mNextArrowBtn = new LLButton("Down Arrow", down_arrow_btn_rect,
-                                                                         out_id, in_id, "",
+                mNextArrowBtn = new LLButton(std::string("Down Arrow"), down_arrow_btn_rect,
+                                                                         out_id, in_id, LLStringUtil::null,
                                                                          &onNextBtn, this, NULL );
                 mNextArrowBtn->setFollowsBottom();
                 mNextArrowBtn->setFollowsLeft();
@@ -1604,31 +1622,31 @@ void LLTabContainer::initButtons()
 
                 out_id = "UIImgBtnJumpLeftOutUUID";
                 in_id = "UIImgBtnJumpLeftInUUID";
-                mJumpPrevArrowBtn = new LLButton("Jump Left Arrow", jump_left_arrow_btn_rect,
-                                                                                 out_id, in_id, "",
+                mJumpPrevArrowBtn = new LLButton(std::string("Jump Left Arrow"), jump_left_arrow_btn_rect,
+                                                                                 out_id, in_id, LLStringUtil::null,
                                                                                  &LLTabContainer::onJumpFirstBtn, this, LLFontGL::sSansSerif );
                 mJumpPrevArrowBtn->setFollowsLeft();
 
                 out_id = "UIImgBtnScrollLeftOutUUID";
                 in_id = "UIImgBtnScrollLeftInUUID";
-                mPrevArrowBtn = new LLButton("Left Arrow", left_arrow_btn_rect,
-                                                                         out_id, in_id, "",
+                mPrevArrowBtn = new LLButton(std::string("Left Arrow"), left_arrow_btn_rect,
+                                                                         out_id, in_id, LLStringUtil::null,
                                                                          &LLTabContainer::onPrevBtn, this, LLFontGL::sSansSerif );
                 mPrevArrowBtn->setHeldDownCallback(onPrevBtnHeld);
                 mPrevArrowBtn->setFollowsLeft();
         
                 out_id = "UIImgBtnJumpRightOutUUID";
                 in_id = "UIImgBtnJumpRightInUUID";
-                mJumpNextArrowBtn = new LLButton("Jump Right Arrow", jump_right_arrow_btn_rect,
-                                                                                 out_id, in_id, "",
+                mJumpNextArrowBtn = new LLButton(std::string("Jump Right Arrow"), jump_right_arrow_btn_rect,
+                                                                                 out_id, in_id, LLStringUtil::null,
                                                                                  &LLTabContainer::onJumpLastBtn, this,
                                                                                  LLFontGL::sSansSerif);
                 mJumpNextArrowBtn->setFollowsRight();
 
                 out_id = "UIImgBtnScrollRightOutUUID";
                 in_id = "UIImgBtnScrollRightInUUID";
-                mNextArrowBtn = new LLButton("Right Arrow", right_arrow_btn_rect,
-                                                                         out_id, in_id, "",
+                mNextArrowBtn = new LLButton(std::string("Right Arrow"), right_arrow_btn_rect,
+                                                                         out_id, in_id, LLStringUtil::null,
                                                                          &LLTabContainer::onNextBtn, this,
                                                                          LLFontGL::sSansSerif);
                 mNextArrowBtn->setFollowsRight();
@@ -1795,3 +1813,4 @@ void LLTabContainer::commitHoveredButton(S32 x, S32 y)
 }
 
 
+