diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-19 21:20:22 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2020-02-19 21:20:22 +0200 |
| commit | 01d4fd2451f6ba2f4f17c7fbf0f9511d37b20e21 (patch) | |
| tree | 10b7ca109a9d908c963146e6da34f67a3aff0365 /indra | |
| parent | 3e5c99269825ec8bb13b14a09ab722ca77bc701b (diff) | |
SL-12726 Fixed overlap issues in Edit Day Cycle floater
Multiline support for current time, space for correct wrap; Fixed text getting out of bonds for labels; Space from time_label was not working;
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml index 18ab69bd5e..6869eefda2 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_ext_day_cycle.xml @@ -19,7 +19,7 @@ <string name="hint_edit">To edit your day cycle, adjust the controls below and click "Save".</string> <!-- Substitutions --> - <string name="time_label"> ([HH]:[MM])</string> + <string name="time_label">([HH]:[MM])</string> <string name="sky_track_label">Sky [ALT]</string> <string name="sky_label">Sky</string> <string name="water_label">Water</string> @@ -185,44 +185,44 @@ left="10" name="p0" top_pad="5" - value="0%[DSC]" - width="80" /> + value="0% [DSC]" + width="90" /> <text follows="left|top|right" height="15" layout="topleft" - left_pad="37" + left_delta="117" name="p1" top_delta="0" - value="25%[DSC]" - width="80" /> + value="25% [DSC]" + width="90" /> <text follows="left|top|right" height="15" layout="topleft" - left_pad="42" + left_delta="122" name="p2" top_delta="0" - value="50%[DSC]" - width="80" /> + value="50% [DSC]" + width="90" /> <text follows="left|top|right" height="15" layout="topleft" - left_pad="42" + left_delta="122" name="p3" top_delta="0" - value="75%[DSC]" - width="80" /> + value="75% [DSC]" + width="90" /> <text follows="left|top|right" height="15" layout="topleft" - left_pad="42" + left_delta="122" name="p4" top_delta="0" - value="100%[DSC]" - width="80" /> + value="100% [DSC]" + width="90" /> <multi_slider decimal_digits="0" draw_track="false" @@ -260,13 +260,14 @@ <text follows="left|bottom" - height="20" + height="30" layout="topleft" left_pad="0" name="current_time" - value="[PRCNT]%[DSC]" + value="[PRCNT]% [DSC]" top_delta="-5" - width="70" /> + width="56" + word_wrap="true"/> <layout_stack follows="all" |