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

EXP-1812 FIX Cannot resize location bar / favorites in top navigation bar in viewer

meow-7.2.2
Richard Linden 2012-01-18 12:59:44 -08:00
parent 23773d792d
commit 40687a930c
4 changed files with 130 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/llui/lllayoutstack.cpp
View File

@ -201,6 +201,7 @@ LLLayoutStack::Params::Params()
clip("clip", true),
open_time_constant("open_time_constant", 0.02f),
close_time_constant("close_time_constant", 0.03f),
resize_bar_overlap("resize_bar_overlap", 1),
border_size("border_size", LLCachedControl<S32>(*LLUI::sSettingGroups["config"], "UIResizeBarHeight", 0))
{}
@ -213,7 +214,8 @@ LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p)
mNeedsLayout(true),
mClip(p.clip),
mOpenTimeConstant(p.open_time_constant),
mCloseTimeConstant(p.close_time_constant)
mCloseTimeConstant(p.close_time_constant),
mResizeBarOverlap(p.resize_bar_overlap)
{}
LLLayoutStack::~LLLayoutStack()
@ -409,21 +411,20 @@ void LLLayoutStack::updateLayout()
panelp->setShape(panel_rect);
panelp->setIgnoreReshape(false);
static LLUICachedControl<S32> resize_bar_overlap ("UIResizeBarOverlap", 0);
LLRect resize_bar_rect(panel_rect);
F32 panel_spacing = (F32)mPanelSpacing * panelp->getVisibleAmount();
if (mOrientation == HORIZONTAL)
{
resize_bar_rect.mLeft = panel_rect.mRight - resize_bar_overlap;
resize_bar_rect.mRight = panel_rect.mRight + panel_spacing + resize_bar_overlap;
resize_bar_rect.mLeft = panel_rect.mRight - mResizeBarOverlap;
resize_bar_rect.mRight = panel_rect.mRight + panel_spacing + mResizeBarOverlap;
cur_pos += panel_visible_dim + panel_spacing;
}
else //VERTICAL
{
resize_bar_rect.mTop = panel_rect.mBottom + resize_bar_overlap;
resize_bar_rect.mBottom = panel_rect.mBottom - panel_spacing - resize_bar_overlap;
resize_bar_rect.mTop = panel_rect.mBottom + mResizeBarOverlap;
resize_bar_rect.mBottom = panel_rect.mBottom - panel_spacing - mResizeBarOverlap;
cur_pos -= panel_visible_dim + panel_spacing;
}

6
indra/llui/lllayoutstack.h
View File

@ -60,6 +60,7 @@ public:
clip;
Optional<F32> open_time_constant,
close_time_constant;
Optional<S32> resize_bar_overlap;
Params();
};
@ -122,9 +123,10 @@ private:
bool mAnimatedThisFrame;
bool mAnimate;
bool mClip;
F32 mOpenTimeConstant;
F32 mCloseTimeConstant;
F32 mOpenTimeConstant;
F32 mCloseTimeConstant;
bool mNeedsLayout;
S32 mResizeBarOverlap;
}; // end class LLLayoutStack

11
indra/newview/app_settings/settings.xml
View File

@ -11378,17 +11378,6 @@
<key>Value</key>
<real>3</real>
</map>
<key>UIResizeBarOverlap</key>
<map>
<key>Comment</key>
<string>Size of UI resize bar overlap</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>S32</string>
<key>Value</key>
<real>1</real>
</map>
<key>UIScaleFactor</key>
<map>
<key>Comment</key>

235
indra/newview/skins/default/xui/en/panel_navigation_bar.xml
View File

@ -59,6 +59,8 @@
follows="all"
height="34"
layout="topleft"
border_size="0"
resize_bar_overlap="3"
left="0"
mouse_opaque="false"
name="nvp_stack"
@ -73,129 +75,130 @@
min_width="480"
name="navigation_layout_panel"
width="480">
<panel
background_visible="false"
follows="left|top|right"
top="3"
height="23"
layout="topleft"
left="0"
name="navigation_panel"
width="480">
<pull_button
follows="left|top"
direction="down"
height="23"
image_overlay="Arrow_Left_Off"
image_bottom_pad="1"
layout="topleft"
left="10"
name="back_btn"
tool_tip="Go back to previous location"
top="2"
width="31" />
<pull_button
follows="left|top"
direction="down"
height="23"
image_overlay="Arrow_Right_Off"
image_bottom_pad="1"
layout="topleft"
left_pad="0"
name="forward_btn"
tool_tip="Go forward one location"
top_delta="0"
width="31" />
<button
follows="left|top"
height="23"
image_bottom_pad="1"
image_overlay="Home_Off"
layout="topleft"
left_pad="7"
name="home_btn"
tool_tip="Teleport to my home location"
top_delta="0"
width="32" />
<location_input
follows="all"
halign="right"
height="23"
label="Location"
layout="topleft"
left_pad="7"
max_chars="254"
mouse_opaque="false"
name="location_combo"
top_delta="0"
width="355">
<combo_list
mouse_wheel_opaque="true"/>
</location_input>
</panel>
</layout_panel>
<layout_panel
auto_resize="false"
layout="topleft"
max_width="5"
min_width="5"
name="nav_bar_resize_handle_panel"
width="5">
<icon
follows="top|right"
height="25"
image_name="ChatBarHandle"
layout="topleft"
left="-6"
name="resize_handle"
top="4"
width="5" />
</layout_panel>
<panel
background_visible="false"
follows="left|top|right"
top="3"
height="23"
layout="topleft"
left="0"
name="navigation_panel"
width="480">
<pull_button
follows="left|top"
direction="down"
height="23"
image_overlay="Arrow_Left_Off"
image_bottom_pad="1"
layout="topleft"
left="10"
name="back_btn"
tool_tip="Go back to previous location"
top="2"
width="31" />
<pull_button
follows="left|top"
direction="down"
height="23"
image_overlay="Arrow_Right_Off"
image_bottom_pad="1"
layout="topleft"
left_pad="0"
name="forward_btn"
tool_tip="Go forward one location"
top_delta="0"
width="31" />
<button
follows="left|top"
height="23"
image_bottom_pad="1"
image_overlay="Home_Off"
layout="topleft"
left_pad="7"
name="home_btn"
tool_tip="Teleport to my home location"
top_delta="0"
width="32" />
<location_input
follows="all"
halign="right"
height="23"
label="Location"
layout="topleft"
left_pad="7"
max_chars="254"
mouse_opaque="false"
name="location_combo"
top_delta="0"
width="355">
<combo_list
mouse_wheel_opaque="true"/>
</location_input>
</panel>
<icon
follows="top|right"
height="25"
image_name="ChatBarHandle"
layout="topleft"
left="-3"
name="resize_handle"
top="4"
width="5" />
</layout_panel>
<layout_panel
follows="top|left"
layout="topleft"
layout="topleft"
auto_resize="true"
user_resize="true"
min_width="315"
name="favorites_layout_panel"
width="315">
<favorites_bar
follows="left|right|top"
font="SansSerifSmall"
height="20"
layout="topleft"
left="0"
name="favorite"
image_drag_indication="Accordion_ArrowOpened_Off"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
width="311">
<label
follows="left|top"
height="15"
layout="topleft"
left="10"
name="favorites_bar_label"
text_color="LtGray"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
top="12"
width="102">
Favorites Bar
</label>
<!-- More button actually is a text box. -->
<more_button
follows="left|bottom"
name=">>"
tab_stop="false"
tool_tip="Show more of My Favorites"
top="13"
width="50"
bottom="0"
valign="bottom">
More &#9660;
</more_button>
</favorites_bar>
<icon
follows="top|left"
height="25"
image_name="ChatBarHandle"
layout="topleft"
left="-318"
name="resize_handle"
top="4"
width="5" />
<favorites_bar
follows="left|right|top"
font="SansSerifSmall"
height="20"
layout="topleft"
left="0"
top="4"
name="favorite"
image_drag_indication="Accordion_ArrowOpened_Off"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
width="311">
<label
follows="left|top"
height="15"
layout="topleft"
left="10"
name="favorites_bar_label"
text_color="LtGray"
tool_tip="Drag Landmarks here for quick access to your favorite places in Second Life!"
top="12"
width="102">
Favorites Bar
</label>
<!-- More button actually is a text box. -->
<more_button
follows="left|bottom"
name=">>"
tab_stop="false"
tool_tip="Show more of My Favorites"
top="13"
width="50"
bottom="0"
valign="bottom">
More &#9660;
</more_button>
</favorites_bar>
</layout_panel>
</layout_stack>