diff options
| author | Richard Linden <none@none> | 2011-03-04 00:40:38 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-03-04 00:40:38 -0800 |
| commit | 25ad57c4b6db3793a0bb6fc1901ea6b0e969c17f (patch) | |
| tree | d36bb05624facee6db46a9e054e3e1cd533a94f8 /indra/newview/skins/minimal/xui/en | |
| parent | 10a572da887ee599d6c4207cda3a106c7fc3aa65 (diff) | |
SOCIAL-603 FIX Move how to button to bottom bar
moves scrollbar up from bottom of screen to leave room for resize thumb
Diffstat (limited to 'indra/newview/skins/minimal/xui/en')
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/main_view.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/panel_bottomtray.xml | 35 | ||||
| -rw-r--r-- | indra/newview/skins/minimal/xui/en/panel_navigation_bar.xml | 14 |
3 files changed, 37 insertions, 16 deletions
diff --git a/indra/newview/skins/minimal/xui/en/main_view.xml b/indra/newview/skins/minimal/xui/en/main_view.xml index a2c16fc9e2..1cc02006f2 100644 --- a/indra/newview/skins/minimal/xui/en/main_view.xml +++ b/indra/newview/skins/minimal/xui/en/main_view.xml @@ -131,13 +131,13 @@ name="bottom_tray_container" visible="false"/> <layout_panel auto_resize="false" - height="200" + height="215" mouse_opaque="false" user_resize="false" name="avatar_picker_and_destination_guide_container" visible="false"> <panel top="0" - height="200" + height="215" left="0" background_visible="true" width="500" diff --git a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml index 2caa8ad903..ccecdd9ece 100644 --- a/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/minimal/xui/en/panel_bottomtray.xml @@ -281,7 +281,40 @@ parameter="agent"/> </bottomtray_button> </layout_panel> - <layout_panel + <layout_panel + auto_resize="false" + follows="right" + height="28" + layout="topleft" + min_height="28" + min_width="65" + mouse_opaque="false" + name="howto_panel" + top_delta="0" + user_resize="false" + width="105"> + <bottomtray_button + can_drag="false" + follows="left|right" + height="23" + image_pressed="PushButton_Press" + image_pressed_selected="PushButton_Selected_Press" + image_selected="PushButton_Selected_Press" + label="How To" + layout="topleft" + left="0" + name="show_help_btn" + tool_tip="Open Second Life How To topics" + is_toggle="true" + top="5" + use_ellipses="true" + width="100"> + <bottomtray_button.commit_callback + function="ToggleHelp" + parameter="f1_help" /> + </bottomtray_button> + </layout_panel> + <layout_panel follows="left|right" height="30" layout="topleft" 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 cd21242edc..6dc1a1c9b0 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="360"> + width="440"> </location_input> <icon follows="right" height="20" @@ -72,17 +72,5 @@ width="31" /> image_name="Button_Separator" name="separator" top="2"/> - <button - right="-70" - top="2" - width="80" - height="22" - label="How To" - follows="top|right" - name="skylight_help"> - <commit_callback - function="ShowHelp" - parameter="f1_help" /> - </button> </panel> </panel> |