livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull fixes from viewer-beta

meow-7.2.2
Merov Linden 2010-10-04 21:49:57 -07:00
parent 7af6d1c731 9010dd5d31
commit bff186d8ef
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -24,3 +24,4 @@ d40ac9dd949cba6dab1cc386da6a2027690c2519 alpha-5
d6781e22543acd7e21b967209f3c6e7003d380e3 fork to viewer-2-0
c6e6324f5be1401f077ad18a4a0f6b46451c2f7b last_sprint
7076e22f9f43f479a4ea75eac447a36364bead5a beta_2.1.3
7076e22f9f43f479a4ea75eac447a36364bead5a 2.2.0-beta1

12
indra/newview/llsidetray.cpp
View File

@ -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());
}

15
indra/newview/skins/default/xui/en/panel_picks.xml
View File

@ -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>