diff options
author | Mike Antipov <mantipov@productengine.com> | 2009-11-10 15:02:42 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2009-11-10 15:02:42 +0200 |
commit | 3eafbeaac57c952b674fb134124354036c9bb967 (patch) | |
tree | 89e4695ea68567bc9e3961798b4ec2d9bb7ba0fc /indra/newview/skins | |
parent | 7dabb3c46e6cdf208ce7dc46b89f431a247d6ba6 (diff) |
Work on major sub-task EXT-991 (Update bottom bar behavior on resize)
Initial refactoring of functionality:
- Re-Fixed bug with visibility of chiclet panel of the min size
- updated bottomtray xml to make buttons identical to each other
- Imroved logic while resizing of bottom tray (changing width of chiclet & nearby panels, hide/show buttons)
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 21 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml | 2 |
2 files changed, 14 insertions, 9 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index ef91c6cd6e..1c1065bc11 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -44,7 +44,7 @@ min_height="23" width="310" top="0" - min_width="300" + min_width="192" name="chat_bar" user_resize="false" filename="panel_nearby_chat_bar.xml" /> @@ -57,7 +57,7 @@ min_height="28" width="100" top_delta="0" - min_width="96" + min_width="100" name="speak_panel" user_resize="false"> <talk_button @@ -90,11 +90,11 @@ min_height="28" width="80" top_delta="0" - min_width="76" + min_width="80" name="gesture_panel" user_resize="false"> <button - follows="right" + follows="left|right" height="23" label="Gesture" layout="topleft" @@ -123,8 +123,9 @@ layout="topleft" min_height="28" name="movement_panel" + user_resize="false" width="80" - min_width="76"> + min_width="80"> <button follows="left|right" height="23" @@ -159,10 +160,10 @@ height="28" layout="topleft" min_height="28" - min_width="76" + min_width="80" name="cam_panel" - top_delta="-10" - width="100"> + user_resize="false" + width="80"> <button follows="left|right" height="23" @@ -197,6 +198,7 @@ follows="left|right" height="28" layout="topleft" + min_width="40" name="snapshot_panel" width="40"> <button @@ -213,6 +215,8 @@ /> </layout_panel> <layout_panel +background_visible="true" +bg_alpha_color="green" mouse_opaque="false" follows="left|right" height="28" @@ -229,6 +233,7 @@ height="28" layout="topleft" left="0" + min_width="129" name="chiclet_list" top="0" chiclet_padding="3" diff --git a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml index 555fedb1ff..eb12178ca0 100644 --- a/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml @@ -9,7 +9,7 @@ top="21" width="310"> <string name="min_width"> - 310 + 192 </string> <string name="max_width"> 320 |