diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-13 16:28:56 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-13 16:28:56 +0000 |
| commit | 3af4837032245403f0c37fe300834fab751e320a (patch) | |
| tree | 39be8d603b5e1f6c8b074277816bc5b18f743948 /indra/newview | |
| parent | 3928710cc740f8c0799d80d40a27fadd05671bc4 (diff) | |
| parent | c5936bbba031272b1deb78ce8ea52663d033695b (diff) | |
Merged in andreykproductengine/maint-eep (pull request #78)
SL-1961 Icon support for multislider and icons on altitudes slider
Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_region_environment.xml | 25 |
2 files changed, 16 insertions, 13 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 258b6714b1..5f4bb7ccb8 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -389,7 +389,7 @@ void LLPanelEnvironmentInfo::updateAltLabel(const std::string &alt_name, U32 sky LLRect sld_rect = sld->getRect(); U32 sld_range = sld_rect.getHeight(); U32 sld_bottom = sld_rect.mBottom; - U32 sld_offset = 8 + 1; // Default slider-thumb width plus stretch. Placeholder until images are implemented. + U32 sld_offset = sld_rect.getWidth(); // Roughly identical to thumb's width in slider. U32 pos = (sld_range - sld_offset) * ((alt_value - 100) / (4000 - 100)); // get related text box @@ -399,7 +399,7 @@ void LLPanelEnvironmentInfo::updateAltLabel(const std::string &alt_name, U32 sky // move related text box LLRect rect = text->getRect(); U32 height = rect.getHeight(); - rect.mBottom = sld_bottom + sld_offset + pos - (height / 2); + rect.mBottom = sld_bottom + (sld_offset / 2 + 1) + pos - (height / 2); rect.mTop = rect.mBottom + height; text->setRect(rect); diff --git a/indra/newview/skins/default/xui/en/panel_region_environment.xml b/indra/newview/skins/default/xui/en/panel_region_environment.xml index a58f38d417..3b77744f1b 100644 --- a/indra/newview/skins/default/xui/en/panel_region_environment.xml +++ b/indra/newview/skins/default/xui/en/panel_region_environment.xml @@ -235,8 +235,8 @@ No parcel is selected. Environmental settings are disabled. <multi_slider decimal_digits="0" follows="bottom" - height="120" - width="10" + height="123" + width="17" orientation="vertical" increment="10" initial_value="100" @@ -246,22 +246,25 @@ No parcel is selected. Environmental settings are disabled. top="20" max_sliders="20" name="sld_altitudes" - show_text="false"> + show_text="false" + thumb_image="Inv_SettingsSky" + thumb_width="17" + thumb_highlight_color="white"> <slider name="sld1" value="200"/> <slider name="sld2" value="400"/> <slider name="sld3" value="600"/> </multi_slider> <icon follows="left|top" - height="10" - width="10" - image_name="Rounded_Square" + height="17" + width="17" + image_name="Inv_SettingsSky" layout="topleft" - name="camera_icon" + name="icon_ground" mouse_opaque="false" visible="true" left_delta="0" - top_pad="-3"/> + top_pad="-9"/> <text type="string" length="1" @@ -280,7 +283,7 @@ No parcel is selected. Environmental settings are disabled. follows="left" height="12" layout="topleft" - left="25" + left="35" top="30" width="200" name="alt1"> @@ -292,7 +295,7 @@ No parcel is selected. Environmental settings are disabled. follows="left|top" height="12" layout="topleft" - left="25" + left="35" top="40" width="200" name="alt2"> @@ -304,7 +307,7 @@ No parcel is selected. Environmental settings are disabled. follows="left|top" height="12" layout="topleft" - left="25" + left="35" top="50" width="200" name="alt3"> |