diff options
Diffstat (limited to 'indra/newview')
5 files changed, 20 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 34237c2503..9749b6fdd4 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -97,7 +97,7 @@ mouse_opaque="false" name="location_combo" top_delta="0" - width="246"> + width="226"> <combo_list mouse_wheel_opaque="true"/> <!-- *TODO: Delete. Let the location_input use the correct art sizes. @@ -137,7 +137,7 @@ name="search_combo_box" tool_tip="Search" top_delta="0" - width="220" > + width="244" > <combo_editor label="Search [SECOND_LIFE]" name="search_combo_editor"/> diff --git a/indra/newview/skins/default/xui/en/panel_status_bar.xml b/indra/newview/skins/default/xui/en/panel_status_bar.xml index 095f661462..c780cf2696 100644 --- a/indra/newview/skins/default/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_status_bar.xml @@ -35,7 +35,7 @@ </panel.string> <panel height="18" - left="-335" + left="-355" width="95" top="1" follows="right|top" @@ -78,11 +78,13 @@ width="55" /> </panel> <combo_box - follows="right|top" + follows="right|top" + drop_down_button.pad_left="10" left_pad="5" top="0" - width="100" + width="120" height="20" + pad_left="5" name="mode_combo" tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." > @@ -96,6 +98,7 @@ value="" /> </combo_box> <text + left_pad="5" type="string" font="SansSerifSmall" text_readonly_color="TimeTextColor" @@ -104,7 +107,6 @@ height="16" top="5" layout="topleft" - left_pad="5" name="TimeText" tool_tip="Current time (Pacific)" width="75"> diff --git a/indra/newview/skins/default/xui/en/widgets/combo_box.xml b/indra/newview/skins/default/xui/en/widgets/combo_box.xml index d1f68a9ef9..82d620d1e6 100644 --- a/indra/newview/skins/default/xui/en/widgets/combo_box.xml +++ b/indra/newview/skins/default/xui/en/widgets/combo_box.xml @@ -16,6 +16,9 @@ font="SansSerifSmall" scale_image="true" pad_right="24" + halign="left" + tab_stop="true" + follows="all" image_unselected="DropDown_Off" image_selected="DropDown_On" image_pressed="DropDown_Press" diff --git a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml index cb9acd4d6a..73a8564274 100644 --- a/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml @@ -63,7 +63,7 @@ width="31" /> mouse_opaque="false" name="location_combo" top_delta="0" - width="350"> + width="325"> </location_input> <icon follows="right" height="20" diff --git a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml index 874a8b47e0..fdd6b5d6ec 100644 --- a/indra/newview/skins/minimal/xui/en/panel_status_bar.xml +++ b/indra/newview/skins/minimal/xui/en/panel_status_bar.xml @@ -12,7 +12,7 @@ name="status" top="19" tab_stop="false" - width="160"> + width="185"> <panel.string name="packet_loss_tooltip"> Packet Loss @@ -35,13 +35,13 @@ </panel.string> <combo_box follows="right|top" - left="5" - drop_down_button.image_color="0 0 0 0" - drop_down_button.hover_glow_amount="0" - drop_down_button.pad_right="0" - top="7" - width="95" - height="20" + left_pad="5" + drop_down_button.pad_left="10" + left="0" + top="5" + pad_left="5" + width="120" + height="23" name="mode_combo" tool_tip="Select your mode. Choose Basic for fast, easy exploration and chat. Choose Advanced to access more features." > |