diff options
author | Mike Antipov <mantipov@productengine.com> | 2009-11-20 14:39:27 +0200 |
---|---|---|
committer | Mike Antipov <mantipov@productengine.com> | 2009-11-20 14:39:27 +0200 |
commit | 91fdbd92c8e93e1676ba501bbc91ee56d38255c3 (patch) | |
tree | 3ae910c9c5401dfb9f65cb6e354221e375506fc3 /indra/newview/skins | |
parent | 8dd743e783464f59b1d80763d8e2e8c52e048cb1 (diff) |
Fixed normal bug EXT-2616 ("Speak" button isn't narrowed and has title when width of window is 800px)
- updated resize behavior to shrink Snapshot button: only speaker is shown in this case.
- updated LLSpeakButton to hide/show its labels
- updated talk_button widget (talk_button.xml) to have correct follows attributes
- also fixed bug with calculating necessary updates for children while extending bottom tray
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/skins')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_bottomtray.xml | 4 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/talk_button.xml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_bottomtray.xml b/indra/newview/skins/default/xui/en/panel_bottomtray.xml index 00711a29e0..6480469f43 100644 --- a/indra/newview/skins/default/xui/en/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/en/panel_bottomtray.xml @@ -60,11 +60,11 @@ min_height="28" width="104" top_delta="0" - min_width="104" + min_width="54" name="speak_panel" user_resize="false"> <talk_button - follows="right" + follows="left|right" height="23" speak_button.tab_stop="true" show_button.tab_stop="true" diff --git a/indra/newview/skins/default/xui/en/widgets/talk_button.xml b/indra/newview/skins/default/xui/en/widgets/talk_button.xml index 1d8257fbc8..64c2e65a6e 100644 --- a/indra/newview/skins/default/xui/en/widgets/talk_button.xml +++ b/indra/newview/skins/default/xui/en/widgets/talk_button.xml @@ -6,6 +6,7 @@ image_unselected="SegmentedBtn_Left_Off" --> <speak_button + follows="left|right" name="left" label="Speak" label_selected="Speak" @@ -13,6 +14,7 @@ tab_stop="false" /> <show_button + follows="right" name="right" label="" left="0" @@ -25,6 +27,7 @@ image_unselected="ComboButton_UpOff" /> <monitor + follows="right" name="monitor" left="0" top="18" |