diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-04 21:49:57 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-04 21:49:57 -0700 |
| commit | bff186d8ef1d3463300975e4e1f2049f60e31b9f (patch) | |
| tree | 678699f99f0996f8289f83398c6d6e4933843d74 /indra | |
| parent | 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff) | |
| parent | 9010dd5d3110fbd5f5de8fad7295111c8c412bf4 (diff) | |
Pull fixes from viewer-beta
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidetray.cpp | 12 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_picks.xml | 15 |
2 files changed, 13 insertions, 14 deletions
diff --git a/indra/newview/llsidetray.cpp b/indra/newview/llsidetray.cpp index 521e5005e8..71f3b0e491 100644 --- a/indra/newview/llsidetray.cpp +++ b/indra/newview/llsidetray.cpp @@ -59,6 +59,8 @@ using namespace LLNotificationsUI; static LLRootViewRegistry::Register<LLSideTray> t1("side_tray"); static LLDefaultChildRegistry::Register<LLSideTrayTab> t2("sidetray_tab"); +static const S32 BOTTOM_BAR_PAD = 5; + static const std::string COLLAPSED_NAME = "<<"; static const std::string EXPANDED_NAME = ">>"; @@ -318,6 +320,9 @@ void LLSideTrayTab::undock(LLFloater* floater_tab) floater_tab->setTitle(mTabTitle); floater_tab->setName(getName()); + // Resize handles get obscured by added panel so move them to front. + floater_tab->moveResizeHandlesToFront(); + // Reshape the floater if needed. LLRect floater_rect; if (floater_tab->hasSavedRect()) @@ -329,13 +334,18 @@ void LLSideTrayTab::undock(LLFloater* floater_tab) { // Detaching for the first time. Reshape the floater. floater_rect = side_tray->getLocalRect(); + + // Reduce detached floater height by small BOTTOM_BAR_PAD not to make it flush with the bottom bar. + floater_rect.mBottom += LLBottomTray::getInstance()->getRect().getHeight() + BOTTOM_BAR_PAD; + floater_rect.makeValid(); floater_tab->reshape(floater_rect.getWidth(), floater_rect.getHeight()); } // Reshape the panel. { - LLRect panel_rect = floater_rect; + LLRect panel_rect = floater_tab->getLocalRect(); panel_rect.mTop -= floater_tab->getHeaderHeight(); + panel_rect.makeValid(); setRect(panel_rect); reshape(panel_rect.getWidth(), panel_rect.getHeight()); } diff --git a/indra/newview/skins/default/xui/en/panel_picks.xml b/indra/newview/skins/default/xui/en/panel_picks.xml index 4f7c4fa9b2..978b204df9 100644 --- a/indra/newview/skins/default/xui/en/panel_picks.xml +++ b/indra/newview/skins/default/xui/en/panel_picks.xml @@ -106,18 +106,6 @@ bg_opaque_color="DkGray2" user_resize="false" auto_resize="true" width="51"> - <button - enabled="false" - follows="bottom|left" - height="18" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" - image_disabled="OptionsMenu_Disabled" - layout="topleft" - left="0" - name="gear_menu_btn" - top_pad="0" - width="18" /> <button follows="bottom|left" height="18" @@ -125,9 +113,10 @@ bg_opaque_color="DkGray2" image_selected="AddItem_Press" image_unselected="AddItem_Off" layout="topleft" - left_pad="15" + left="0" name="new_btn" tool_tip="Create a new pick or classified at the current location" + top="0" width="18" /> </layout_panel> |