From b58e2e6958002835cce217c6c4983b739d4e3684 Mon Sep 17 00:00:00 2001 From: Maxim Nikolenko Date: Mon, 9 Feb 2026 19:21:27 +0200 Subject: UI controls adjustments and selection color update * UI controls adjustments and selection color update * Use constexpr instead of magic numbers --- indra/llui/lltextbase.cpp | 5 ++- indra/newview/skins/default/colors.xml | 3 ++ .../skins/default/xui/en/floater_about_land.xml | 4 +- .../default/xui/en/floater_inventory_settings.xml | 2 +- .../skins/default/xui/en/floater_model_preview.xml | 14 +++--- .../skins/default/xui/en/floater_world_map.xml | 51 +++++++++++----------- .../newview/skins/default/xui/en/inspect_group.xml | 10 ++--- .../skins/default/xui/en/panel_group_notices.xml | 4 +- .../xui/en/panel_notification_list_item.xml | 6 ++- .../newview/skins/default/xui/en/panel_people.xml | 5 ++- .../xui/en/panel_performance_preferences.xml | 19 ++++---- .../default/xui/en/panel_preferences_advanced.xml | 22 +++------- .../default/xui/en/panel_preferences_general.xml | 11 ++--- .../default/xui/en/panel_preferences_graphics1.xml | 4 +- .../default/xui/en/panel_preferences_privacy.xml | 2 + .../skins/default/xui/en/widgets/line_editor.xml | 2 +- .../default/xui/en/widgets/simple_text_editor.xml | 2 +- 17 files changed, 84 insertions(+), 82 deletions(-) diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index 2079ff17fc..1b8572f532 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -51,6 +51,9 @@ const F32 CURSOR_FLASH_DELAY = 1.0f; // in seconds const S32 CURSOR_THICKNESS = 2; const F32 TRIPLE_CLICK_INTERVAL = 0.3f; // delay between double and triple click. +constexpr F32 FOCUSED_SELECTION_BG_ALPHA = 1; +constexpr F32 UNFOCUSED_SELECTION_BG_ALPHA = 0.7f; + LLTextBase::line_info::line_info(S32 index_start, S32 index_end, LLRect rect, S32 line_num) : mDocIndexStart(index_start), mDocIndexEnd(index_end), @@ -529,7 +532,7 @@ void LLTextBase::drawSelectionBackground() // Draw the selection box (we're using a box instead of reversing the colors on the selected text). gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE); const LLColor4& color = mSelectedBGColor; - F32 alpha = hasFocus() ? 0.7f : 0.3f; + F32 alpha = hasFocus() ? FOCUSED_SELECTION_BG_ALPHA : UNFOCUSED_SELECTION_BG_ALPHA; alpha *= getDrawContext().mAlpha; LLColor4 selection_color(color.mV[VRED], color.mV[VGREEN], color.mV[VBLUE], alpha); diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 84e5518a03..ab094fc1cd 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -11,6 +11,9 @@ + diff --git a/indra/newview/skins/default/xui/en/floater_about_land.xml b/indra/newview/skins/default/xui/en/floater_about_land.xml index c5b42b6dae..347b523a6b 100644 --- a/indra/newview/skins/default/xui/en/floater_about_land.xml +++ b/indra/newview/skins/default/xui/en/floater_about_land.xml @@ -974,7 +974,7 @@ layout="topleft" left="28" name="Set to group:" - top_pad="5" + top_pad="9" width="176"> Set to group: @@ -1022,7 +1022,7 @@ layout="topleft" left="28" name="Owned by others:" - top_pad="5" + top_pad="9" width="176"> Owned by others: diff --git a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml index a51e7a844a..9d2ed43756 100644 --- a/indra/newview/skins/default/xui/en/floater_inventory_settings.xml +++ b/indra/newview/skins/default/xui/en/floater_inventory_settings.xml @@ -145,7 +145,7 @@ font="SansSerifMedium" text_color="White" top_delta="1" - width="300"> + width="310"> Clicking on "Show in inventory" or "Find original" + width="53"> Display... + top_pad="10"> + top_pad="10"> + top_pad="10"> + top_pad="10"> + top_pad="10"> + top_pad="21"> - - land auction @@ -270,7 +270,7 @@ mouse_opaque="true" name="square2_owner" left="20" - top_pad="-5" + top_pad="-2" width="16" /> by owner @@ -290,7 +290,7 @@ control_name="MapShowGridCoords" layout="topleft" follows="top|right" - top_pad="2" + top_pad="5" left="3" height="16" width="22" @@ -300,8 +300,8 @@ type="string" layout="topleft" follows="top|right" - top_delta="2" - left_pad="3" + top_delta="-2" + left_pad="2" height="16" width="220" halign="left" @@ -357,7 +357,7 @@ height="16" layout="topleft" left="135" - top_pad="1" + top_pad="5" name="event_chk" width="22" /> - - @@ -89,7 +89,7 @@ L$123 to join height="23" label="Leave" left="8" - top="125" + top="146" name="leave_btn" width="103" commit_callback.function="InspectGroup.Leave"/> @@ -98,7 +98,7 @@ L$123 to join height="23" label="View Profile" name="view_profile_btn" - top="125" + top="146" left="117" width="103" commit_callback.function="InspectGroup.ViewProfile" /> diff --git a/indra/newview/skins/default/xui/en/panel_group_notices.xml b/indra/newview/skins/default/xui/en/panel_group_notices.xml index 1162dcf20d..b1d5086a29 100644 --- a/indra/newview/skins/default/xui/en/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/en/panel_group_notices.xml @@ -28,7 +28,7 @@ You can turn off Notices on the General tab. left="5" name="lbl2" right="-1" - top="5" + top="3" width="300"> Notices are kept for 14 days. Maximum 200 per group daily @@ -42,7 +42,7 @@ Maximum 200 per group daily left="0" right="-1" name="notice_list" - top_pad="0" + top_pad="6" width="304"> Sender: "Resident R e s i d e n t R e s i d e n t" - + @@ -105,7 +106,8 @@ use_ellipses="true" word_wrap="false" mouse_opaque="false" name="sender_or_fee_box_exp" visible="false"> Sender: "Resident R e s i d e n t R e s i d e n t" - + diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 1be34550fa..d43045ebaa 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -183,6 +183,7 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip increment="1" follows="left|top" left="5" + top_pad="5" min_val="0" max_val="4096" label="Range:" @@ -199,13 +200,13 @@ Learn about [https://community.secondlife.com/knowledgebase/joining-and-particip + top_pad="3"> + width="42"> Fastest + width="45"> Farther + width="375"> Shadows significantly improve visual quality but can reduce speed. + width="153"> + + width="192"> (Enter value between 0.0 and 4.0) 0 @@ -446,7 +447,7 @@ font="SansSerifSmall" height="18" layout="topleft" - left_pad="30" + left_pad="29" name="2_lbl" width="7"> 2 @@ -468,7 +469,7 @@ layout="topleft" left_pad="30" name="4_lbl" - width="7"> + width="8"> 4 5 diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml index 86999b1afb..08595ed7e6 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml @@ -13,18 +13,6 @@ name="aspect_ratio_text"> [NUM]:[DEN] - - Cache: - @@ -86,7 +74,7 @@ font="SansSerif" height="23" layout="topleft" - left="80" + left="33" max_length_bytes="4096" name="cache_location" top_pad="5" @@ -113,7 +101,7 @@ left_pad="3" name="default_cache_location" top_delta="0" - width="100"> + width="104"> diff --git a/indra/newview/skins/default/xui/en/panel_preferences_general.xml b/indra/newview/skins/default/xui/en/panel_preferences_general.xml index aa641a35f7..809a5faab9 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_general.xml @@ -110,7 +110,8 @@ left="255" max_chars="135" name="time_format_combobox" - width="70"> + width="71"> + + top_pad="5" /> + top_pad="5"/> Faster @@ -216,7 +216,7 @@ min_val="64" max_val="512" name="DrawDistance" - top_delta="40" + top_delta="34" width="427" /> + -- cgit v1.3