From 7269f7a3a567f2823b0cca1d0bc716a7a0389ecc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 8 Aug 2023 22:16:09 +0300 Subject: viewer#2023 Google Inter --- autobuild.xml | 34 ++++++++++ indra/cmake/ViewerMiscLibs.cmake | 1 + indra/llrender/llfontfreetype.cpp | 29 +++++++-- indra/llrender/llfontfreetype.h | 11 +++- indra/llrender/llfontgl.cpp | 4 +- indra/llrender/llfontgl.h | 2 +- indra/llrender/llfontregistry.cpp | 50 ++++++++++++--- indra/llrender/llfontregistry.h | 21 +++++-- indra/newview/skins/default/xui/en/fonts.xml | 94 ++++++++++++++++------------ indra/newview/skins/default/xui/ja/fonts.xml | 94 ++++++++++++++-------------- 10 files changed, 231 insertions(+), 109 deletions(-) diff --git a/autobuild.xml b/autobuild.xml index 95ee34439b..1fa5182ef5 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -2554,6 +2554,40 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors description Viewer fonts + google-fonts + + copyright + Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter) + description + Google fonts + license + SIL Open Font License, Version 1.1 + license_file + LICENSES/google_inter.txt + name + google-fonts + platforms + + common + + archive + + creds + github + hash + 22bcc72ed59926f00ed58a57f5e3cd3d9d82595f + hash_algorithm + sha1 + url + https://api.github.com/repos/secondlife/3p-google-fonts/releases/assets/195509500 + + name + common + + + version + 1.0.0.11083103671 + viewer-manager platforms diff --git a/indra/cmake/ViewerMiscLibs.cmake b/indra/cmake/ViewerMiscLibs.cmake index cae68fbc11..ee67977715 100644 --- a/indra/cmake/ViewerMiscLibs.cmake +++ b/indra/cmake/ViewerMiscLibs.cmake @@ -20,4 +20,5 @@ use_prebuilt_binary(slvoice) use_prebuilt_binary(nanosvg) use_prebuilt_binary(viewer-fonts) +use_prebuilt_binary(google-fonts) use_prebuilt_binary(emoji_shortcodes) diff --git a/indra/llrender/llfontfreetype.cpp b/indra/llrender/llfontfreetype.cpp index 62b551f1e0..9a3ae6c55f 100644 --- a/indra/llrender/llfontfreetype.cpp +++ b/indra/llrender/llfontfreetype.cpp @@ -144,6 +144,7 @@ LLFontFreetype::LLFontFreetype() pFtStream(NULL), #endif mIsFallback(false), + mHinting(EFontHinting::FORCE_AUTOHINT), mFTFace(NULL), mRenderGlyphCount(0), mStyle(0), @@ -186,7 +187,7 @@ void ft_close_cb(FT_Stream stream) { } #endif -bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n) +bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags) { // Don't leak face objects. This is also needed to deal with // changed font file names. @@ -215,6 +216,8 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v } mIsFallback = is_fallback; + mHinting = hinting; + mFontFlags = flags; F32 pixels_per_em = (point_size / 72.f)*vert_dpi; // Size in inches * dpi error = FT_Set_Char_Size(mFTFace, /* handle to face object */ @@ -272,6 +275,12 @@ bool LLFontFreetype::loadFace(const std::string& filename, F32 point_size, F32 v { mStyle |= LLFontGL::BOLD; } + else if (flags & LLFontGL::BOLD) + { + // FontGL applies programmatic bolding to fonts that are a part of 'bold' descriptor but don't have the bold style set. + // Ex: Inter SemiBold doesn't have FT_STYLE_FLAG_BOLD and without this style it would be bolded programmatically. + mStyle |= LLFontGL::BOLD; + } if(mFTFace->style_flags & FT_STYLE_FLAG_ITALIC) { @@ -422,7 +431,12 @@ F32 LLFontFreetype::getXKerning(llwchar char_left, llwchar char_right) const llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); - return delta.x*(1.f/64.f); + if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE) + { + // Return the X advance + return (F32)(delta.x * (1.0 / 64.0)); + } + return (F32)delta.x; } F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LLFontGlyphInfo* right_glyph_info) const @@ -437,7 +451,12 @@ F32 LLFontFreetype::getXKerning(const LLFontGlyphInfo* left_glyph_info, const LL llverify(!FT_Get_Kerning(mFTFace, left_glyph, right_glyph, ft_kerning_unfitted, &delta)); - return delta.x*(1.f/64.f); + if (mFTFace->face_flags & FT_FACE_FLAG_SCALABLE) + { + // Return the X advance + return (F32)(delta.x * (1.0 / 64.0)); + } + return (F32)delta.x; } bool LLFontFreetype::hasGlyph(llwchar wch) const @@ -700,7 +719,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll if (mFTFace == NULL) return; - FT_Int32 load_flags = FT_LOAD_FORCE_AUTOHINT; + FT_Int32 load_flags = (FT_Int32)mHinting; if (EFontGlyphType::Color == bitmap_type) { // We may not actually get a color render so our caller should always examine mFTFace->glyph->bitmap.pixel_mode @@ -743,7 +762,7 @@ void LLFontFreetype::renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, ll void LLFontFreetype::reset(F32 vert_dpi, F32 horz_dpi) { resetBitmapCache(); - loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0); + loadFace(mName, mPointSize, vert_dpi ,horz_dpi, mIsFallback, 0, mHinting, mFontFlags); if (!mIsFallback) { // This is the head of the list - need to rebuild ourself and all fallbacks. diff --git a/indra/llrender/llfontfreetype.h b/indra/llrender/llfontfreetype.h index 783bf4a4b3..0045768d54 100644 --- a/indra/llrender/llfontfreetype.h +++ b/indra/llrender/llfontfreetype.h @@ -42,6 +42,7 @@ struct FT_FaceRec_; typedef struct FT_FaceRec_* LLFT_Face; struct FT_StreamRec_; typedef struct FT_StreamRec_ LLFT_Stream; +enum class EFontHinting : S32; class LLFontManager { @@ -86,7 +87,7 @@ public: // is_fallback should be true for fallback fonts that aren't used // to render directly (Unicode backup, primarily) - bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n); + bool loadFace(const std::string& filename, F32 point_size, F32 vert_dpi, F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags); S32 getNumFaces(const std::string& filename); @@ -155,7 +156,11 @@ private: bool setSubImageBGRA(U32 x, U32 y, U32 bitmap_num, U16 width, U16 height, const U8* data, U32 stride) const; bool hasGlyph(llwchar wch) const; // Has a glyph for this character LLFontGlyphInfo* addGlyph(llwchar wch, EFontGlyphType glyph_type) const; // Add a new character to the font if necessary - LLFontGlyphInfo* addGlyphFromFont(const LLFontFreetype *fontp, llwchar wch, U32 glyph_index, EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found) + LLFontGlyphInfo* addGlyphFromFont( + const LLFontFreetype *fontp, + llwchar wch, + U32 glyph_index, + EFontGlyphType bitmap_type) const; // Add a glyph from this font to the other (returns the glyph_index, 0 if not found) void renderGlyph(EFontGlyphType bitmap_type, U32 glyph_index, llwchar wch) const; void insertGlyphInfo(llwchar wch, LLFontGlyphInfo* gi) const; @@ -176,6 +181,8 @@ private: #endif bool mIsFallback; + EFontHinting mHinting; + S32 mFontFlags; typedef std::pair, char_functor_t> fallback_font_t; typedef std::vector fallback_font_vector_t; fallback_font_vector_t mFallbackFonts; // A list of fallback fonts to look for glyphs in (for Unicode chars) diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 16eec1fdd2..d95eea526b 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -90,14 +90,14 @@ void LLFontGL::destroyGL() mFontFreetype->destroyGL(); } -bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n) +bool LLFontGL::loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags) { if(mFontFreetype == reinterpret_cast(NULL)) { mFontFreetype = new LLFontFreetype; } - return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n); + return mFontFreetype->loadFace(filename, point_size, vert_dpi, horz_dpi, is_fallback, face_n, hinting, flags); } S32 LLFontGL::getNumFaces(const std::string& filename) diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 1c8e036f58..652cec8e5b 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -87,7 +87,7 @@ public: void destroyGL(); - bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n); + bool loadFace(const std::string& filename, F32 point_size, const F32 vert_dpi, const F32 horz_dpi, bool is_fallback, S32 face_n, EFontHinting hinting, S32 flags); S32 getNumFaces(const std::string& filename); S32 getCacheGeneration() const; diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index c48a389f6a..777bba3f25 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles()); } -void LLFontDescriptor::addFontFile(const std::string& file_name, const std::string& char_functor) +void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); } -void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, const std::string& char_functor) +void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontCollectionFiles.push_back(LLFontFileInfo(file_name, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); } LLFontRegistry::LLFontRegistry(bool create_gl_textures) @@ -289,23 +289,57 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc) { std::string font_file_name = child->getTextContents(); std::string char_functor; + EFontHinting hinting = EFontHinting::FORCE_AUTOHINT; + S32 flags = 0; if (child->hasAttribute("functor")) { child->getAttributeString("functor", char_functor); } + if (child->hasAttribute("font_hinting")) + { + std::string attr_hinting; + child->getAttributeString("font_hinting", attr_hinting); + LLStringUtil::toLower(attr_hinting); + + if (attr_hinting == "default") + { + hinting = EFontHinting::DEFAULT; + } + else if (attr_hinting == "force_auto") + { + hinting = EFontHinting::FORCE_AUTOHINT; + } + else if (attr_hinting == "no_hinting") + { + hinting = EFontHinting::NO_HINTING; + } + } + + if (child->hasAttribute("flags")) + { + std::string attr_flags; + child->getAttributeString("flags", attr_flags); + LLStringUtil::toLower(attr_flags); + + if (attr_flags == "bold") + { + flags |= LLFontGL::BOLD; + } + } + if (child->hasAttribute("load_collection")) { bool col = false; child->getAttributeBOOL("load_collection", col); if (col) { - desc.addFontCollectionFile(font_file_name, char_functor); + desc.addFontCollectionFile(font_file_name, hinting, flags, char_functor); } } - desc.addFontFile(font_file_name, char_functor); + desc.addFontFile(font_file_name, hinting, flags, char_functor); } else if (child->hasName("os")) { @@ -462,7 +496,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) // Add ultimate fallback list - generated dynamically on linux, // null elsewhere. std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files), - [](const std::string& file_name) { return LLFontFileInfo(file_name); }); + [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0); }); // Load fonts based on names. if (font_files.empty()) @@ -518,7 +552,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) fontp = new LLFontGL; } if (fontp->loadFace(font_path, point_size_scale, - LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i)) + LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags)) { is_font_loaded = true; if (is_first_found) diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index 8bbf5aa30c..bf190d903c 100644 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -34,22 +34,35 @@ class LLFontGL; typedef std::vector string_vec_t; +enum class EFontHinting : S32 +{ + DEFAULT = 0, + NO_HINTING = 0x8000U, + FORCE_AUTOHINT = 0x20, +}; + struct LLFontFileInfo { - LLFontFileInfo(const std::string& file_name, const std::function& char_functor = nullptr) + LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, const std::function& char_functor = nullptr) : FileName(file_name) , CharFunctor(char_functor) + , mHinting(hinting) + , mFlags(flags) { } - LLFontFileInfo(const LLFontFileInfo& ffi) + LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags) : FileName(ffi.FileName) , CharFunctor(ffi.CharFunctor) + , mHinting(hinting) + , mFlags(flags) { } std::string FileName; std::function CharFunctor; + EFontHinting mHinting; + S32 mFlags; }; typedef std::vector font_file_info_vec_t; @@ -71,10 +84,10 @@ public: const std::string& getSize() const { return mSize; } void setSize(const std::string& size) { mSize = size; } - void addFontFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null); + void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t & getFontFiles() const { return mFontFiles; } void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; } - void addFontCollectionFile(const std::string& file_name, const std::string& char_functor = LLStringUtil::null); + void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; } void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; } diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index 45ec1e27f1..fafe6a3ebc 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -1,8 +1,10 @@ - - DejaVuSans.ttf + + Inter_18pt-Regular.ttf TwemojiSVG.ttf meiryo.TTC @@ -31,9 +33,10 @@ - - DejaVuSans-Bold.ttf + + Inter_18pt-SemiBold.ttf arialbd.ttf @@ -42,8 +45,10 @@ - - DejaVuSans.ttf + + Inter_18pt-Regular.ttf arial.ttf @@ -52,31 +57,35 @@ - - DejaVuSans-Bold.ttf + + Inter_18pt-SemiBold.ttf - - DejaVuSans-Oblique.ttf + + Inter_18pt-Italic.ttf - - DejaVuSans-BoldOblique.ttf + + Inter_18pt-BoldItalic.ttf TwemojiSVG.ttf - - + + DejaVuSansMono.ttf @@ -103,9 +112,10 @@ DejaVuSans-BoldOblique.ttf - - DejaVuSans.ttf + + Inter_18pt-Regular.ttf arial.ttf @@ -114,10 +124,11 @@ - - DejaVuSans-Bold.ttf + + Inter_18pt-SemiBold.ttf arialbd.ttf @@ -126,10 +137,11 @@ - - DejaVuSans-Oblique.ttf + + Inter_18pt-Italic.ttf ariali.ttf @@ -138,10 +150,11 @@ - - DejaVuSans-BoldOblique.ttf + + Inter_18pt-BoldItalic.ttf arialbi.ttf @@ -150,10 +163,11 @@ - + times.ttf - DejaVuSans.ttf + Inter_18pt-Regular.ttf - NotoSansCJKjp-Medium.otf - - - DejaVuSans.ttf + NotoSansCJKjp-SemiBold.otf + + Inter_18pt-Regular.ttf + YuGothM.ttc @@ -41,7 +41,7 @@ - YuGothic-Medium.otf + YuGothic-SemiBold.otf ヒラギノ角ゴシック W3.ttc @@ -82,9 +82,9 @@ NotoSansCJKjp-Bold.otf - - DejaVuSans-Bold.ttf - + + Inter_18pt-SemiBold.ttf + YuGothB.ttc @@ -106,9 +106,9 @@ NotoSansCJKjp-Bold.otf - - DejaVuSans.ttf - + + Inter_18pt-Regular.ttf + arial.ttf @@ -121,19 +121,19 @@ - - DejaVuSans-Bold.ttf - + + Inter_18pt-SemiBold.ttf + - - DejaVuSans-Oblique.ttf - + + Inter_18pt-Italic.ttf + - - DejaVuSans-BoldOblique.ttf - + + Inter_18pt-SemiBoldItalic.ttf + @@ -144,29 +144,29 @@ - - DejaVuSans.ttf - + + Inter_18pt-Regular.ttf + - - DejaVuSans-Bold.ttf - + + Inter_18pt-SemiBold.ttf + - - DejaVuSans-Oblique.ttf - + + Inter_18pt-Italic.ttf + - - DejaVuSans-BoldOblique.ttf - + + Inter_18pt-SemiBoldItalic.ttf + - - DejaVuSans.ttf - + + Inter_18pt-Regular.ttf + arial.ttf @@ -179,9 +179,9 @@ - - DejaVuSans-Bold.ttf - + + Inter_18pt-SemiBold.ttf + arialbd.ttf @@ -194,9 +194,9 @@ - - DejaVuSans-Oblique.ttf - + + Inter_18pt-Italic.ttf + ariali.ttf @@ -209,9 +209,9 @@ - - DejaVuSans-BoldOblique.ttf - + + Inter_18pt-SemiBoldItalic.ttf + arialbi.ttf @@ -227,9 +227,9 @@ times.ttf - - DejaVuSans.ttf - + + Inter_18pt-Regular.ttf + -- cgit v1.3 From ce45474f0ab3c0eb89d6a2cd92d1fc4ef356fa0a Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 17 Feb 2025 18:03:34 +0200 Subject: viewer#2023 Google Inter #2 Bums sizes up because Inter is smaller than our old font --- indra/newview/skins/default/xui/ja/fonts.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/ja/fonts.xml b/indra/newview/skins/default/xui/ja/fonts.xml index 465131499e..874f530f17 100644 --- a/indra/newview/skins/default/xui/ja/fonts.xml +++ b/indra/newview/skins/default/xui/ja/fonts.xml @@ -233,7 +233,7 @@ - - - + + + -- cgit v1.3 From 2cd88c6a2b1f2113fc999b94c51903bfa059c03f Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 21 Aug 2025 18:22:02 +0300 Subject: Update accordion ctrl; change default selection color --- indra/llui/llaccordionctrltab.cpp | 2 +- indra/newview/skins/default/colors.xml | 2 +- .../textures/containers/Accordion_Selected.png | Bin 228 -> 15050 bytes .../textures/containers/TabLeft_Flat_Off.png | Bin 0 -> 18169 bytes .../textures/containers/TabLeft_Flat_Selected.png | Bin 0 -> 18193 bytes .../textures/containers/TabTop_First_Flat_Off.png | Bin 0 -> 18167 bytes .../containers/TabTop_First_Flat_Selected.png | Bin 0 -> 18172 bytes .../textures/containers/TabTop_Last_Flat_Off.png | Bin 0 -> 18164 bytes .../containers/TabTop_Last_Flat_Selected.png | Bin 0 -> 18166 bytes .../textures/containers/TabTop_Middle_Flat_Off.png | Bin 0 -> 18168 bytes .../containers/TabTop_Middle_Flat_Selected.png | Bin 0 -> 18174 bytes indra/newview/skins/default/textures/textures.xml | 9 ++++++++ .../skins/default/xui/en/floater_preferences.xml | 4 ++-- .../skins/default/xui/en/widgets/button.xml | 3 ++- .../skins/default/xui/en/widgets/tab_container.xml | 24 ++++++++++----------- 15 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png create mode 100644 indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png diff --git a/indra/llui/llaccordionctrltab.cpp b/indra/llui/llaccordionctrltab.cpp index ac66525030..ae844dd22f 100644 --- a/indra/llui/llaccordionctrltab.cpp +++ b/indra/llui/llaccordionctrltab.cpp @@ -39,7 +39,7 @@ static const std::string DD_BUTTON_NAME = "dd_button"; static const std::string DD_TEXTBOX_NAME = "dd_textbox"; static const std::string DD_HEADER_NAME = "dd_header"; -static const S32 HEADER_HEIGHT = 23; +static const S32 HEADER_HEIGHT = 25; static const S32 HEADER_IMAGE_LEFT_OFFSET = 5; static const S32 HEADER_TEXT_LEFT_OFFSET = 30; static const F32 AUTO_OPEN_TIME = 1.f; diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 2ad285eb1f..8d4d28a999 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -4,7 +4,7 @@ + value="0.3 0.82 1 1" /> diff --git a/indra/newview/skins/default/textures/containers/Accordion_Selected.png b/indra/newview/skins/default/textures/containers/Accordion_Selected.png index 0616dea6a3..ab852007ab 100644 Binary files a/indra/newview/skins/default/textures/containers/Accordion_Selected.png and b/indra/newview/skins/default/textures/containers/Accordion_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png new file mode 100644 index 0000000000..d6c6bc41ec Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png new file mode 100644 index 0000000000..cc310bbc26 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabLeft_Flat_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png new file mode 100644 index 0000000000..177d341ba3 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png new file mode 100644 index 0000000000..54bd4d923d Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_First_Flat_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png new file mode 100644 index 0000000000..28a315665b Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png new file mode 100644 index 0000000000..993e79b37f Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Last_Flat_Selected.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png new file mode 100644 index 0000000000..1f5d926cc8 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Off.png differ diff --git a/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png new file mode 100644 index 0000000000..e4e4d27d42 Binary files /dev/null and b/indra/newview/skins/default/textures/containers/TabTop_Middle_Flat_Selected.png differ diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index d650e7e791..28824ac1f4 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -685,6 +685,15 @@ with the same filename but different name + + + + + + + + + diff --git a/indra/newview/skins/default/xui/en/floater_preferences.xml b/indra/newview/skins/default/xui/en/floater_preferences.xml index 4b0e0bb221..b7d992bcb4 100644 --- a/indra/newview/skins/default/xui/en/floater_preferences.xml +++ b/indra/newview/skins/default/xui/en/floater_preferences.xml @@ -82,8 +82,8 @@ name="pref core" tab_group="1" tab_position="left" - tab_width="140" - tab_padding_right="0" + tab_width="136" + tab_padding_right="4" top="40" width="658"> - - + - + + tab_left_image_unselected="TabLeft_Flat_Off" + tab_left_image_selected="TabLeft_Flat_Selected"/> -- cgit v1.3 From b03a92ceb73dca89708d7ed2c47043040a764f9c Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 1 Sep 2025 14:57:20 +0300 Subject: Update icons textures --- .../textures/bottomtray/Cam_Rotate_Center.png | Bin 10689 -> 1816 bytes .../default/textures/bottomtray/Cam_Rotate_In.png | Bin 407 -> 1794 bytes .../textures/bottomtray/Cam_Tracking_Center.png | Bin 1714 -> 1806 bytes .../default/textures/bottomtray/Cam_Tracking_In.png | Bin 328 -> 1717 bytes .../textures/bottomtray/Movement_Backward_On.png | Bin 353 -> 1723 bytes .../default/textures/bottomtray/Movement_Down_On.png | Bin 50907 -> 2091 bytes .../textures/bottomtray/Movement_Forward_On.png | Bin 321 -> 1710 bytes .../default/textures/bottomtray/Movement_Left_On.png | Bin 51806 -> 2269 bytes .../textures/bottomtray/Movement_Right_On.png | Bin 50161 -> 2063 bytes .../textures/bottomtray/Movement_TurnLeft_On.png | Bin 430 -> 1806 bytes .../textures/bottomtray/Movement_TurnRight_On.png | Bin 427 -> 1946 bytes .../default/textures/bottomtray/Movement_Up_On.png | Bin 51965 -> 2282 bytes .../default/textures/bottomtray/VoicePTT_Lvl1.png | Bin 557 -> 1960 bytes .../default/textures/bottomtray/VoicePTT_Lvl2.png | Bin 663 -> 2053 bytes .../default/textures/bottomtray/VoicePTT_On.png | Bin 451 -> 1842 bytes .../skins/default/textures/icons/Info_Over.png | Bin 520 -> 1974 bytes .../skins/default/textures/icons/Inv_SysClosed.png | Bin 656 -> 2266 bytes .../skins/default/textures/icons/Inv_SysOpen.png | Bin 766 -> 2361 bytes .../skins/default/textures/icons/back_arrow_off.png | Bin 1223 -> 2546 bytes .../skins/default/textures/icons/back_arrow_over.png | Bin 1256 -> 2556 bytes .../default/textures/icons/back_arrow_press.png | Bin 1417 -> 2638 bytes .../skins/default/textures/icons/check_mark.png | Bin 1227 -> 2136 bytes indra/newview/skins/default/textures/icons/hand.png | Bin 1183 -> 2337 bytes .../skins/default/textures/icons/see_me_online.png | Bin 645 -> 1843 bytes .../default/textures/navbar/Favorite_Star_Active.png | Bin 704 -> 2241 bytes .../default/textures/navbar/Favorite_Star_Over.png | Bin 445 -> 1967 bytes .../skins/default/textures/navbar/Row_Selection.png | Bin 231 -> 1736 bytes .../textures/widgets/track_control_moon_back.png | Bin 1767 -> 2587 bytes .../textures/widgets/track_control_moon_front.png | Bin 2060 -> 2479 bytes .../textures/widgets/track_control_sphere.png | Bin 7537 -> 9705 bytes .../textures/widgets/track_control_sun_back.png | Bin 1626 -> 2439 bytes .../skins/default/textures/windows/Inspector_I.png | Bin 547 -> 1974 bytes 32 files changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png index ffc3c85ea2..2e84daaf6b 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_Center.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png index c8560c0869..1854cb87df 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Rotate_In.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png index 2812d614e6..d009044ee1 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_Center.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png index ae2c57c207..a9415e9cc0 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png and b/indra/newview/skins/default/textures/bottomtray/Cam_Tracking_In.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png index 9f31d461b5..f22f6e23b6 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Backward_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png index f7ed4c25fb..238d005bef 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Down_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png index d0a825a682..ad4a02ee27 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Forward_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png index 2f81fb1588..1a134661eb 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Left_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png index 4f86e81a15..8c5bf3bc66 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Right_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png index b211371e64..1eeab859e5 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_TurnLeft_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png index e937c3f012..57762defe4 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_TurnRight_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png index ed4902f3ee..512bd3b64e 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png and b/indra/newview/skins/default/textures/bottomtray/Movement_Up_On.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png index cd18ae310d..b1012e505e 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png index b0ed6ee8eb..49cdadded7 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2.png differ diff --git a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png index be4881b64c..9afe58dcd1 100644 Binary files a/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png and b/indra/newview/skins/default/textures/bottomtray/VoicePTT_On.png differ diff --git a/indra/newview/skins/default/textures/icons/Info_Over.png b/indra/newview/skins/default/textures/icons/Info_Over.png index 0efd596d3e..1d00c2c175 100644 Binary files a/indra/newview/skins/default/textures/icons/Info_Over.png and b/indra/newview/skins/default/textures/icons/Info_Over.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png index 9af3b60cbd..19afa94cc4 100644 Binary files a/indra/newview/skins/default/textures/icons/Inv_SysClosed.png and b/indra/newview/skins/default/textures/icons/Inv_SysClosed.png differ diff --git a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png index 01e7dbff8f..7ca0f5a849 100644 Binary files a/indra/newview/skins/default/textures/icons/Inv_SysOpen.png and b/indra/newview/skins/default/textures/icons/Inv_SysOpen.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png index ab82dfc0a7..c0af924dde 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_off.png and b/indra/newview/skins/default/textures/icons/back_arrow_off.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png index ad8c1f8d2c..6b215dfa59 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_over.png and b/indra/newview/skins/default/textures/icons/back_arrow_over.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png index 8aecc3d876..54bec88420 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_press.png and b/indra/newview/skins/default/textures/icons/back_arrow_press.png differ diff --git a/indra/newview/skins/default/textures/icons/check_mark.png b/indra/newview/skins/default/textures/icons/check_mark.png index 5431dd31c8..00ec32964d 100644 Binary files a/indra/newview/skins/default/textures/icons/check_mark.png and b/indra/newview/skins/default/textures/icons/check_mark.png differ diff --git a/indra/newview/skins/default/textures/icons/hand.png b/indra/newview/skins/default/textures/icons/hand.png index d8ef2e22fa..6effb7c77d 100644 Binary files a/indra/newview/skins/default/textures/icons/hand.png and b/indra/newview/skins/default/textures/icons/hand.png differ diff --git a/indra/newview/skins/default/textures/icons/see_me_online.png b/indra/newview/skins/default/textures/icons/see_me_online.png index 4059035b20..51d369003c 100644 Binary files a/indra/newview/skins/default/textures/icons/see_me_online.png and b/indra/newview/skins/default/textures/icons/see_me_online.png differ diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png index e27dbe2cad..cbb78cd514 100644 Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Active.png differ diff --git a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png index 7909d54f2b..6b4092bf49 100644 Binary files a/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png and b/indra/newview/skins/default/textures/navbar/Favorite_Star_Over.png differ diff --git a/indra/newview/skins/default/textures/navbar/Row_Selection.png b/indra/newview/skins/default/textures/navbar/Row_Selection.png index fc4f0c07ef..0eeb4f494c 100644 Binary files a/indra/newview/skins/default/textures/navbar/Row_Selection.png and b/indra/newview/skins/default/textures/navbar/Row_Selection.png differ diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png index 03d1e805e1..1e2ce7bc83 100644 Binary files a/indra/newview/skins/default/textures/widgets/track_control_moon_back.png and b/indra/newview/skins/default/textures/widgets/track_control_moon_back.png differ diff --git a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png index cdc52fe08a..25f2914ecc 100644 Binary files a/indra/newview/skins/default/textures/widgets/track_control_moon_front.png and b/indra/newview/skins/default/textures/widgets/track_control_moon_front.png differ diff --git a/indra/newview/skins/default/textures/widgets/track_control_sphere.png b/indra/newview/skins/default/textures/widgets/track_control_sphere.png index 60a81d1fea..adfb51edd2 100644 Binary files a/indra/newview/skins/default/textures/widgets/track_control_sphere.png and b/indra/newview/skins/default/textures/widgets/track_control_sphere.png differ diff --git a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png index b3191ccc5d..98bae90332 100644 Binary files a/indra/newview/skins/default/textures/widgets/track_control_sun_back.png and b/indra/newview/skins/default/textures/widgets/track_control_sun_back.png differ diff --git a/indra/newview/skins/default/textures/windows/Inspector_I.png b/indra/newview/skins/default/textures/windows/Inspector_I.png index 843f6e9fbe..d51cf43051 100644 Binary files a/indra/newview/skins/default/textures/windows/Inspector_I.png and b/indra/newview/skins/default/textures/windows/Inspector_I.png differ -- cgit v1.3 From e7a72f850c6f1cb62ece7c13b28e48aba774b6b1 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Wed, 3 Sep 2025 19:25:33 +0300 Subject: Update floater title, checkbox and combobox textures --- indra/newview/skins/default/colors.xml | 2 +- .../default/textures/widgets/Checkbox_Disabled.png | Bin 470 -> 14960 bytes .../skins/default/textures/widgets/Checkbox_Off.png | Bin 480 -> 14961 bytes .../skins/default/textures/widgets/Checkbox_On.png | Bin 635 -> 15341 bytes .../default/textures/widgets/Checkbox_On_Disabled.png | Bin 621 -> 15333 bytes .../default/textures/widgets/Checkbox_On_Press.png | Bin 647 -> 15245 bytes .../skins/default/textures/widgets/Checkbox_Press.png | Bin 515 -> 15313 bytes .../skins/default/textures/widgets/DropDown_Off.png | Bin 678 -> 15125 bytes .../skins/default/textures/widgets/DropDown_On.png | Bin 869 -> 15433 bytes .../skins/default/textures/widgets/DropDown_Press.png | Bin 702 -> 15322 bytes .../default/textures/windows/Window_Background.png | Bin 508 -> 15072 bytes .../default/textures/windows/Window_Foreground.png | Bin 517 -> 15060 bytes 12 files changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 8d4d28a999..162c194dd4 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -984,7 +984,7 @@ value="1 0.14 0 1" /> + value="0.26 0.36 0.47 1"/> diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png index 8439f82e29..383ff8f6e3 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png index cb9a04d84f..66f12496cb 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Off.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On.png b/indra/newview/skins/default/textures/widgets/Checkbox_On.png index 0ec090504a..549bbde5cd 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png index 5759f7de69..9c80670837 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png index ba46e91c55..903c61f01b 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png and b/indra/newview/skins/default/textures/widgets/Checkbox_On_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png index 5f5a33d878..96dfd7267c 100644 Binary files a/indra/newview/skins/default/textures/widgets/Checkbox_Press.png and b/indra/newview/skins/default/textures/widgets/Checkbox_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Off.png b/indra/newview/skins/default/textures/widgets/DropDown_Off.png index b118e7a7d4..9f6a2313b9 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Off.png and b/indra/newview/skins/default/textures/widgets/DropDown_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_On.png b/indra/newview/skins/default/textures/widgets/DropDown_On.png index 613a8c2ff6..a498465940 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_On.png and b/indra/newview/skins/default/textures/widgets/DropDown_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Press.png b/indra/newview/skins/default/textures/widgets/DropDown_Press.png index fa3a152df1..b6bf4d1c22 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Press.png and b/indra/newview/skins/default/textures/widgets/DropDown_Press.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_Background.png b/indra/newview/skins/default/textures/windows/Window_Background.png index 9864ec0db8..83a09584c1 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Background.png and b/indra/newview/skins/default/textures/windows/Window_Background.png differ diff --git a/indra/newview/skins/default/textures/windows/Window_Foreground.png b/indra/newview/skins/default/textures/windows/Window_Foreground.png index a86b236504..1f4f9040bc 100644 Binary files a/indra/newview/skins/default/textures/windows/Window_Foreground.png and b/indra/newview/skins/default/textures/windows/Window_Foreground.png differ -- cgit v1.3 From 047b4b56620f3cef02cbc67e142faeb79731a6c5 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 4 Sep 2025 21:55:31 +0300 Subject: Update button, scroll and slider widgets --- indra/newview/skins/default/colors.xml | 2 +- indra/newview/skins/default/textures/textures.xml | 1 + .../default/textures/widgets/MarketplaceBtn_Off.png | Bin 911 -> 15460 bytes .../textures/widgets/MarketplaceBtn_Selected.png | Bin 912 -> 15538 bytes .../default/textures/widgets/PushButton_Disabled.png | Bin 569 -> 15664 bytes .../skins/default/textures/widgets/PushButton_Off.png | Bin 579 -> 15660 bytes .../textures/widgets/PushButton_Selected_Press.png | Bin 998 -> 15333 bytes .../default/textures/widgets/ScrollThumb_Horiz.png | Bin 509 -> 15228 bytes .../default/textures/widgets/ScrollThumb_Vert.png | Bin 494 -> 15233 bytes .../default/textures/widgets/SliderThumb_Disabled.png | Bin 592 -> 15444 bytes .../default/textures/widgets/SliderThumb_Off.png | Bin 579 -> 16378 bytes .../default/textures/widgets/SliderThumb_Press.png | Bin 582 -> 15307 bytes .../default/textures/widgets/SliderTrack_Horiz.png | Bin 420 -> 15033 bytes .../default/textures/widgets/TextField_Highlight.png | Bin 0 -> 15490 bytes 14 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 indra/newview/skins/default/textures/widgets/TextField_Highlight.png diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 162c194dd4..5a74291f65 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -7,7 +7,7 @@ value="0.3 0.82 1 1" /> + value="0.3 0.82 1 0.13" /> diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index 28824ac1f4..bfc4293300 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -711,6 +711,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png index de71f763d3..b2767c6174 100644 Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png index 8bfa3acb42..de50b29f79 100644 Binary files a/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png and b/indra/newview/skins/default/textures/widgets/MarketplaceBtn_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png index e99ec4b14b..64a9a2d885 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/PushButton_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Off.png b/indra/newview/skins/default/textures/widgets/PushButton_Off.png index 29eeed7c78..113c371a4d 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Off.png and b/indra/newview/skins/default/textures/widgets/PushButton_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png index 8588576fb0..062fcf9246 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Selected_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png index 9afc907c1c..eb9563e0ee 100644 Binary files a/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Horiz.png differ diff --git a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png index ede643e528..144a7cba25 100644 Binary files a/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png and b/indra/newview/skins/default/textures/widgets/ScrollThumb_Vert.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png index 5cfa3ae4e1..fb98907be2 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png index 66cdcbeb94..231aead651 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png index 0bf8e43e81..0fb0054bfb 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png and b/indra/newview/skins/default/textures/widgets/SliderThumb_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png index 720830f83f..65cfaf4c62 100644 Binary files a/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png and b/indra/newview/skins/default/textures/widgets/SliderTrack_Horiz.png differ diff --git a/indra/newview/skins/default/textures/widgets/TextField_Highlight.png b/indra/newview/skins/default/textures/widgets/TextField_Highlight.png new file mode 100644 index 0000000000..71c2a5dbc3 Binary files /dev/null and b/indra/newview/skins/default/textures/widgets/TextField_Highlight.png differ -- cgit v1.3 From 6c00bf01c01608ec6d9d5e66d14f1a37088c0d06 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Fri, 5 Sep 2025 18:12:37 +0300 Subject: More texture updates --- .../default/textures/widgets/ComboButton_Disabled.png | Bin 575 -> 15356 bytes .../default/textures/widgets/ComboButton_Off.png | Bin 583 -> 15127 bytes .../default/textures/widgets/ComboButton_Selected.png | Bin 630 -> 15216 bytes .../skins/default/textures/widgets/PushButton_On.png | Bin 835 -> 15296 bytes .../default/textures/widgets/PushButton_Over.png | Bin 589 -> 15808 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png index ebeb813349..5b2bc7b163 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png index 4f573cf6fa..7199470307 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Off.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png index 1a834bfbbc..715b401ce5 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_On.png b/indra/newview/skins/default/textures/widgets/PushButton_On.png index 65d92a9d82..db70f75dd6 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_On.png and b/indra/newview/skins/default/textures/widgets/PushButton_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Over.png index 819f27c0ba..67dfa0ca75 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Over.png and b/indra/newview/skins/default/textures/widgets/PushButton_Over.png differ -- cgit v1.3 From 6499c24cc68d423d0c23cf8d45d8ca3f5f8155fb Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 8 Sep 2025 19:12:05 +0300 Subject: More texture updates #2 --- indra/newview/skins/default/colors.xml | 2 +- .../default/textures/widgets/RadioButton_Disabled.png | Bin 606 -> 15444 bytes .../default/textures/widgets/RadioButton_Off.png | Bin 628 -> 16378 bytes .../skins/default/textures/widgets/RadioButton_On.png | Bin 679 -> 16857 bytes .../textures/widgets/RadioButton_On_Disabled.png | Bin 652 -> 15907 bytes .../default/textures/widgets/RadioButton_On_Press.png | Bin 688 -> 15781 bytes .../default/textures/widgets/RadioButton_Press.png | Bin 666 -> 15307 bytes .../textures/widgets/SegmentedBtn_Middle_Disabled.png | Bin 454 -> 15261 bytes .../textures/widgets/SegmentedBtn_Middle_Selected.png | Bin 524 -> 15265 bytes .../widgets/SegmentedBtn_Middle_Selected_Disabled.png | Bin 613 -> 15279 bytes .../widgets/SegmentedBtn_Middle_Selected_Press.png | Bin 728 -> 15359 bytes .../skins/default/xui/en/panel_navigation_bar.xml | 4 ++-- .../default/xui/en/panel_preferences_graphics1.xml | 14 +++++++------- .../skins/default/xui/en/panel_preferences_sound.xml | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 5a74291f65..970b5a51de 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -377,7 +377,7 @@ reference="Black_50" /> + reference="white" /> diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png index 32ec25fe0e..fb98907be2 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png index 5d267af5dc..231aead651 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Off.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On.png b/indra/newview/skins/default/textures/widgets/RadioButton_On.png index e6bf0db157..066872ff82 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On.png differ diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png index 72aae43618..43af5bec2f 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png index f3883b82b3..6870a48129 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png and b/indra/newview/skins/default/textures/widgets/RadioButton_On_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png index 0025256045..0fb0054bfb 100644 Binary files a/indra/newview/skins/default/textures/widgets/RadioButton_Press.png and b/indra/newview/skins/default/textures/widgets/RadioButton_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png index d9f05d33ec..8ad008ba51 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png index d2342f6538..ca5f84a088 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png index 6223ad8dfe..9b1531a11e 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png index 101d5a0930..28f5bf37f7 100644 Binary files a/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png and b/indra/newview/skins/default/textures/widgets/SegmentedBtn_Middle_Selected_Press.png differ diff --git a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml index 85cf4419a3..4d924a6c24 100644 --- a/indra/newview/skins/default/xui/en/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_navigation_bar.xml @@ -89,7 +89,7 @@ image_hover_unselected="PushButton_Over" image_bottom_pad="1" layout="topleft" - left="10" + left="9" name="back_btn" tool_tip="Go back to previous location" top="2" @@ -102,7 +102,7 @@ image_hover_unselected="PushButton_Over" image_bottom_pad="1" layout="topleft" - left_pad="0" + left_pad="1" name="forward_btn" tool_tip="Go forward one location" top_delta="0" diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml index bf07ae4d68..1e6d5dabc8 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -121,7 +121,7 @@ Better -- cgit v1.3 From d224e0a232e9e155830d5c8dcc7fbe39b045f27d Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 9 Sep 2025 18:17:22 +0300 Subject: More texture updates #3; change selected font color to black --- indra/llui/lllineeditor.cpp | 3 +-- indra/newview/llcolorswatch.cpp | 18 +++++++++++++----- indra/newview/llpanelface.cpp | 2 +- indra/newview/skins/default/colors.xml | 21 ++++++++++++--------- .../textures/build/Object_Cone_Selected.png | Bin 576 -> 2394 bytes .../textures/build/Object_Cube_Selected.png | Bin 477 -> 2278 bytes .../textures/build/Object_Cylinder_Selected.png | Bin 443 -> 2273 bytes .../textures/build/Object_Grass_Selected.png | Bin 757 -> 2538 bytes .../textures/build/Object_Hemi_Cone_Selected.png | Bin 531 -> 2357 bytes .../build/Object_Hemi_Cylinder_Selected.png | Bin 463 -> 2292 bytes .../textures/build/Object_Hemi_Sphere_Selected.png | Bin 696 -> 2530 bytes .../textures/build/Object_Prism_Selected.png | Bin 485 -> 2419 bytes .../textures/build/Object_Pyramid_Selected.png | Bin 594 -> 2389 bytes .../textures/build/Object_Ring_Selected.png | Bin 738 -> 2560 bytes .../textures/build/Object_Sphere_Selected.png | Bin 1003 -> 2799 bytes .../textures/build/Object_Tetrahedron_Selected.png | Bin 558 -> 2394 bytes .../textures/build/Object_Torus_Selected.png | Bin 825 -> 2645 bytes .../textures/build/Object_Tree_Selected.png | Bin 839 -> 2794 bytes .../textures/build/Object_Tube_Selected.png | Bin 552 -> 2506 bytes .../skins/default/textures/locked_image_dark.png | Bin 0 -> 18122 bytes .../skins/default/textures/square_selection.png | Bin 0 -> 18061 bytes indra/newview/skins/default/textures/textures.xml | 3 +++ .../default/textures/widgets/ComboButton_UpOff.png | Bin 553 -> 16654 bytes .../textures/widgets/ComboButton_UpSelected.png | Bin 603 -> 16828 bytes .../default/textures/widgets/DropDown_Disabled.png | Bin 669 -> 15771 bytes .../default/textures/widgets/PushButton_Press.png | Bin 614 -> 15657 bytes .../default/textures/widgets/Stepper_Down_Off.png | Bin 477 -> 15325 bytes .../textures/widgets/Stepper_Down_Press.png | Bin 502 -> 15389 bytes .../default/textures/widgets/Stepper_Up_Off.png | Bin 482 -> 15315 bytes .../default/textures/widgets/Stepper_Up_Press.png | Bin 521 -> 15543 bytes .../default/xui/en/widgets/folder_view_item.xml | 2 +- .../xui/en/widgets/inbox_folder_view_folder.xml | 2 +- .../xui/en/widgets/inbox_folder_view_item.xml | 2 +- .../default/xui/en/widgets/simple_text_editor.xml | 2 +- 34 files changed, 34 insertions(+), 21 deletions(-) create mode 100644 indra/newview/skins/default/textures/locked_image_dark.png create mode 100644 indra/newview/skins/default/textures/square_selection.png diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index b534c8d4e8..350c1e6996 100644 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -1954,12 +1954,11 @@ void LLLineEditor::draw() width = llmin(width, mTextRightEdge - ll_round(rendered_pixels_right)); gl_rect_2d(ll_round(rendered_pixels_right), cursor_top, ll_round(rendered_pixels_right)+width, cursor_bottom, color); - LLColor4 tmp_color( 1.f - text_color.mV[0], 1.f - text_color.mV[1], 1.f - text_color.mV[2], alpha ); rendered_text += mFontBufferSelection.render( mGLFont, mText, mScrollHPos + rendered_text, rendered_pixels_right, text_bottom, - tmp_color, + LLColor4::black, LLFontGL::LEFT, LLFontGL::BOTTOM, 0, LLFontGL::NO_SHADOW, diff --git a/indra/newview/llcolorswatch.cpp b/indra/newview/llcolorswatch.cpp index 97d2345778..ce236dec66 100644 --- a/indra/newview/llcolorswatch.cpp +++ b/indra/newview/llcolorswatch.cpp @@ -200,13 +200,14 @@ void LLColorSwatchCtrl::draw() F32 alpha = getTransparencyType() == TT_ACTIVE ? 1.0f : getCurrentTransparency(); mBorder->setKeyboardFocusHighlight(hasFocus()); - // Draw border - LLRect border( 0, getRect().getHeight(), getRect().getWidth(), mLabelHeight ); - gl_rect_2d( border, mBorderColor.get(), false ); - LLRect interior = border; + LLRect gl_border(0, getRect().getHeight(), getRect().getWidth(), mLabelHeight); + LLColor4 gl_border_color = mBorderColor.get(); + LLRect interior = gl_border; interior.stretch( -1 ); + bool show_border_ctrl = true; + // Check state if ( mValid ) { @@ -239,7 +240,9 @@ void LLColorSwatchCtrl::draw() { if (mFallbackImage.notNull()) { - mFallbackImage->draw(interior.mLeft, interior.mBottom, interior.getWidth(), interior.getHeight(), LLColor4::white % alpha); + mFallbackImage->draw(interior.mLeft - 1, interior.mBottom - 1, mFallbackImage->getWidth(), mFallbackImage->getHeight(), LLColor4::white % alpha); + gl_border_color = LLUIColorTable::instance().getColor("ColorSwatchBorderColorGray").get(); + show_border_ctrl = false; } else { @@ -250,6 +253,11 @@ void LLColorSwatchCtrl::draw() } } + mBorder->setVisible(show_border_ctrl); + + // Draw border + gl_rect_2d(gl_border, gl_border_color, false); + LLUICtrl::draw(); } diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index 3ab48f69c8..d7ffb88e35 100644 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -1904,7 +1904,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/) if (mColorSwatch) { mColorSwatch->setEnabled( false ); - mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") ); + mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image") ); mColorSwatch->setValid(false); } diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index 970b5a51de..c5f16cc342 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -10,7 +10,7 @@ value="0.3 0.82 1 0.13" /> + value="0.3 0.82 1 0.35" /> @@ -359,7 +359,7 @@ reference="Black" /> + reference="EmphasisColor" /> @@ -453,9 +453,6 @@ - @@ -862,19 +859,25 @@ + + - - + + + @@ -874,6 +876,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png index 5a067aca7c..9e74524be4 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpOff.png differ diff --git a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png index ff56367147..aa8865c33d 100644 Binary files a/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png and b/indra/newview/skins/default/textures/widgets/ComboButton_UpSelected.png differ diff --git a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png index 9a69f7e0d9..fff0cfaff2 100644 Binary files a/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png and b/indra/newview/skins/default/textures/widgets/DropDown_Disabled.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Press.png b/indra/newview/skins/default/textures/widgets/PushButton_Press.png index b0a92d8ffe..8dfa9030b1 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Press.png and b/indra/newview/skins/default/textures/widgets/PushButton_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png index 51d269bd45..720946aba6 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png index b4f19b7dbb..505fa6c82c 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Down_Press.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png index a01d928aef..9482e4773e 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Off.png differ diff --git a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png index d5b672d943..ca311768c4 100644 Binary files a/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png and b/indra/newview/skins/default/textures/widgets/Stepper_Up_Press.png differ diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index 50c5285e04..3b20e3a908 100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -6,7 +6,7 @@ folder_indentation="8" item_height="20" item_top_pad="4" - selection_image="Rounded_Square" + selection_image="Square_Selection" mouse_opaque="true" follows="left|top|right" left_pad="5" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml index 865c145022..41ef9d2b8a 100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml @@ -6,7 +6,7 @@ folder_indentation="8" item_height="20" item_top_pad="4" - selection_image="Rounded_Square" + selection_image="Square_Selection" left_pad="5" icon_pad="2" icon_width="16" diff --git a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml index 09cbb1d3ab..ad4249da4e 100644 --- a/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/inbox_folder_view_item.xml @@ -2,7 +2,7 @@ Date: Thu, 11 Sep 2025 17:38:17 +0300 Subject: More UI changes and updates: friend name color; worn items color; logo for system notifications; buttons textures. --- indra/newview/skins/default/colors.xml | 7 +++++-- .../textures/containers/Toolbar_Middle_Selected.png | Bin 296 -> 15778 bytes .../newview/skins/default/textures/icons/SL_Logo.png | Bin 1515 -> 1136 bytes .../skins/default/textures/icons/back_arrow_off.png | Bin 2546 -> 802 bytes .../skins/default/textures/icons/back_arrow_over.png | Bin 2556 -> 799 bytes .../skins/default/textures/icons/back_arrow_press.png | Bin 2638 -> 802 bytes .../skins/default/xui/en/sidepanel_appearance.xml | 16 +++------------- .../default/xui/en/widgets/inventory_list_item.xml | 2 +- .../xui/en/widgets/wearable_outfit_list_item.xml | 2 +- 9 files changed, 10 insertions(+), 17 deletions(-) diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index c5f16cc342..d5a001c539 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -338,7 +338,7 @@ reference="EmphasisColor" /> + reference="EmphasisColor" /> @@ -592,7 +592,7 @@ reference="White" /> + reference="EmphasisColor" /> @@ -758,6 +758,9 @@ + diff --git a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png index 642113b135..62f82879cf 100644 Binary files a/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png and b/indra/newview/skins/default/textures/containers/Toolbar_Middle_Selected.png differ diff --git a/indra/newview/skins/default/textures/icons/SL_Logo.png b/indra/newview/skins/default/textures/icons/SL_Logo.png index 1eafc304f5..7b147df369 100644 Binary files a/indra/newview/skins/default/textures/icons/SL_Logo.png and b/indra/newview/skins/default/textures/icons/SL_Logo.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_off.png b/indra/newview/skins/default/textures/icons/back_arrow_off.png index c0af924dde..0c96257470 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_off.png and b/indra/newview/skins/default/textures/icons/back_arrow_off.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_over.png b/indra/newview/skins/default/textures/icons/back_arrow_over.png index 6b215dfa59..a7fac5ef99 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_over.png and b/indra/newview/skins/default/textures/icons/back_arrow_over.png differ diff --git a/indra/newview/skins/default/textures/icons/back_arrow_press.png b/indra/newview/skins/default/textures/icons/back_arrow_press.png index 54bec88420..0c96257470 100644 Binary files a/indra/newview/skins/default/textures/icons/back_arrow_press.png and b/indra/newview/skins/default/textures/icons/back_arrow_press.png differ diff --git a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml index a16b0b58da..6225464492 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_appearance.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_appearance.xml @@ -50,24 +50,14 @@ width="333"> layout="topleft" name="openoutfit_btn" visible="false" /> - @@ -76,7 +66,7 @@ width="333"> + color="WornOutfitTextColor" /> + color="WornOutfitTextColor" /> Date: Mon, 25 Aug 2025 22:36:00 +0300 Subject: Update search fields texture; change menu selection color --- .../skins/default/textures/widgets/ListItem_Over.png | Bin 443 -> 15029 bytes .../default/textures/widgets/ListItem_Select.png | Bin 460 -> 15029 bytes .../skins/default/xui/en/widgets/filter_editor.xml | 8 ++++---- .../skins/default/xui/en/widgets/search_editor.xml | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Over.png b/indra/newview/skins/default/textures/widgets/ListItem_Over.png index e72c1c4020..9316567e7b 100644 Binary files a/indra/newview/skins/default/textures/widgets/ListItem_Over.png and b/indra/newview/skins/default/textures/widgets/ListItem_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/ListItem_Select.png b/indra/newview/skins/default/textures/widgets/ListItem_Select.png index 0e16a8b454..cd65d347d6 100644 Binary files a/indra/newview/skins/default/textures/widgets/ListItem_Select.png and b/indra/newview/skins/default/textures/widgets/ListItem_Select.png differ diff --git a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml index 604f62b099..3a0f43de3d 100644 --- a/indra/newview/skins/default/xui/en/widgets/filter_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/filter_editor.xml @@ -7,10 +7,10 @@ select_on_focus="true" text_tentative_color="TextFgTentativeColor" highlight_text_field="true" - background_image="TextField_Search_Off" - background_image_disabled="TextField_Search_Disabled" - background_image_focused="TextField_Search_Active" - background_image_highlight="TextField_Search_Highlight"> + background_image="TextField_Off" + background_image_disabled="TextField_Disabled" + background_image_focused="TextField_Active" + background_image_highlight="TextField_Highlight"> + background_image="TextField_Off" + background_image_disabled="TextField_Disabled" + background_image_focused="TextField_Active" + background_image_highlight="TextField_Highlight"> Date: Fri, 19 Sep 2025 17:24:01 +0300 Subject: viewer#2023 Google Inter #3 Size increase shouldn't have been specific for ja, it was meant to be universal. --- indra/newview/skins/default/xui/en/fonts.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index fafe6a3ebc..de8e640455 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -180,15 +180,15 @@ /> Date: Tue, 13 Jan 2026 02:56:53 +0200 Subject: Permit vertically adjusting label position in inventory --- indra/llui/llfolderviewitem.cpp | 14 +++++++++----- indra/llui/llfolderviewitem.h | 4 ++++ .../skins/default/xui/en/widgets/folder_view_item.xml | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/indra/llui/llfolderviewitem.cpp b/indra/llui/llfolderviewitem.cpp index 878f1cb856..88a8659319 100644 --- a/indra/llui/llfolderviewitem.cpp +++ b/indra/llui/llfolderviewitem.cpp @@ -158,9 +158,11 @@ LLFolderViewItem::Params::Params() icon_width("icon_width", 0), text_pad("text_pad", 0), text_pad_right("text_pad_right", 0), + text_pad_top("text_pad_top", 1), single_folder_mode("single_folder_mode", false), double_click_override("double_click_override", false), arrow_size("arrow_size", 0), + arrow_pad_top("arrow_pad_top", 1), max_folder_item_overlap("max_folder_item_overlap", 0) { } @@ -200,7 +202,9 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p) mIconWidth(p.icon_width), mTextPad(p.text_pad), mTextPadRight(p.text_pad_right), + mTextPadTop(p.text_pad_top), mArrowSize(p.arrow_size), + mArrowPadTop(p.arrow_pad_top), mSingleFolderMode(p.single_folder_mode), mMaxFolderItemOverlap(p.max_folder_item_overlap), mDoubleClickOverride(p.double_click_override) @@ -810,7 +814,7 @@ void LLFolderViewItem::drawOpenFolderArrow() if (hasVisibleChildren() || !isFolderComplete()) { gl_draw_scaled_rotated_image( - mIndentation, getRect().getHeight() - mArrowSize - mTextPad - sTopPad, + mIndentation, getRect().getHeight() - mArrowSize - mArrowPadTop - sTopPad, mArrowSize, mArrowSize, mControlLabelRotation, sFolderArrowImg->getImage(), sFgColor); } } @@ -1044,7 +1048,7 @@ void LLFolderViewItem::draw() S32 filter_string_length = mViewModelItem->hasFilterStringMatch() ? (S32)mViewModelItem->getFilterStringSize() : 0; F32 right_x = 0; - F32 y = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad; + F32 y = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad; F32 text_left = (F32)getLabelXPos(); LLWString combined_string = mLabel + mLabelSuffix; @@ -1123,7 +1127,7 @@ void LLFolderViewItem::draw() if(mLabelSuffix.empty() || (font == sSuffixFont)) { F32 match_string_left = text_left + font->getWidthF32(combined_string.c_str(), 0, filter_offset + filter_string_length) - font->getWidthF32(combined_string.c_str(), filter_offset, filter_string_length); - F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad; + F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad; font->render(combined_string, filter_offset, match_string_left, yy, sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, filter_string_length, S32_MAX, &right_x); @@ -1134,7 +1138,7 @@ void LLFolderViewItem::draw() if(label_filter_length > 0) { F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, filter_offset + label_filter_length) - font->getWidthF32(mLabel.c_str(), filter_offset, label_filter_length); - F32 yy = (F32)rect_height - line_height - (F32)mTextPad - (F32)sTopPad; + F32 yy = (F32)rect_height - line_height - (F32)mTextPadTop - (F32)sTopPad; font->render(mLabel, filter_offset, match_string_left, yy, sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, label_filter_length, S32_MAX, &right_x); @@ -1145,7 +1149,7 @@ void LLFolderViewItem::draw() { S32 suffix_offset = llmax(0, filter_offset - (S32)mLabel.size()); F32 match_string_left = text_left + font->getWidthF32(mLabel.c_str(), 0, static_cast(mLabel.size())) + sSuffixFont->getWidthF32(mLabelSuffix.c_str(), 0, suffix_offset + suffix_filter_length) - sSuffixFont->getWidthF32(mLabelSuffix.c_str(), suffix_offset, suffix_filter_length); - F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPad - (F32)sTopPad; + F32 yy = (F32)rect_height - sSuffixFont->getLineHeight() - (F32)mTextPadTop - (F32)sTopPad; sSuffixFont->render(mLabelSuffix, suffix_offset, match_string_left, yy, sFilterTextColor, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, suffix_filter_length, S32_MAX, &right_x); diff --git a/indra/llui/llfolderviewitem.h b/indra/llui/llfolderviewitem.h index 23d794bf26..258a806b91 100644 --- a/indra/llui/llfolderviewitem.h +++ b/indra/llui/llfolderviewitem.h @@ -73,7 +73,9 @@ public: icon_width, text_pad, text_pad_right, + text_pad_top, arrow_size, + arrow_pad_top, max_folder_item_overlap; Optional single_folder_mode, double_click_override; @@ -117,7 +119,9 @@ protected: mIconWidth, mTextPad, mTextPadRight, + mTextPadTop, mArrowSize, + mArrowPadTop, mMaxFolderItemOverlap; F32 mControlLabelRotation; diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index 50c5285e04..352555466a 100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -14,5 +14,7 @@ icon_width="16" text_pad="1" text_pad_right="4" + text_pad_top="1" arrow_size="12" + arrow_pad_top="1" max_folder_item_overlap="2"/> -- cgit v1.3 From 92dc2af47d5fc904e30024db71de13013123f7fc Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Thu, 22 Jan 2026 22:55:11 +0200 Subject: Expose floater's header font to XUI --- indra/llui/lldraghandle.cpp | 10 +++++----- indra/llui/lldraghandle.h | 8 +++++++- indra/llui/llfloater.cpp | 10 ++++++++-- indra/llui/llfloater.h | 6 ++++-- indra/newview/app_settings/settings.xml | 11 ----------- indra/newview/skins/default/xui/en/widgets/floater.xml | 2 ++ 6 files changed, 26 insertions(+), 21 deletions(-) diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index 15536178ab..d8d1791dca 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -59,7 +59,9 @@ LLDragHandle::LLDragHandle(const LLDragHandle::Params& p) mMaxTitleWidth( 0 ), mForeground( true ), mDragHighlightColor(p.drag_highlight_color()), - mDragShadowColor(p.drag_shadow_color()) + mDragShadowColor(p.drag_shadow_color()), + mFont(p.font), + mLabelVPad(p.label_vpad()) { static LLUICachedControl snap_margin ("SnapMargin", 0); @@ -98,12 +100,11 @@ void LLDragHandleTop::setTitle(const std::string& title) } else { - const LLFontGL* font = LLFontGL::getFontSansSerif(); LLTextBox::Params params; params.name("Drag Handle Title"); params.rect(getRect()); params.initial_value(trimmed_title); - params.font(font); + params.font(mFont); params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT); params.font_shadow(LLFontGL::DROP_SHADOW_SOFT); params.use_ellipses = true; @@ -236,7 +237,6 @@ void LLDragHandleLeft::draw() void LLDragHandleTop::reshapeTitleBox() { - static LLUICachedControl title_vpad("UIFloaterTitleVPad", 0); if( ! mTitleBox) { return; @@ -248,7 +248,7 @@ void LLDragHandleTop::reshapeTitleBox() LLRect title_rect; title_rect.setLeftTopAndSize( LEFT_PAD, - getRect().getHeight() - title_vpad, + getRect().getHeight() - mLabelVPad, title_width, title_height); diff --git a/indra/llui/lldraghandle.h b/indra/llui/lldraghandle.h index 73211d5292..f768839749 100644 --- a/indra/llui/lldraghandle.h +++ b/indra/llui/lldraghandle.h @@ -43,13 +43,17 @@ public: : public LLInitParam::Block { Optional label; + Optional label_vpad; Optional drag_highlight_color; Optional drag_shadow_color; + Optional font; Params() : label("label"), + label_vpad("label_vpad", 7), drag_highlight_color("drag_highlight_color", LLUIColorTable::instance().getColor("DefaultHighlightLight")), - drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark")) + drag_shadow_color("drag_shadow_color", LLUIColorTable::instance().getColor("DefaultShadowDark")), + font("font", LLFontGL::getFontSansSerif()) { changeDefault(mouse_opaque, true); changeDefault(follows.flags, FOLLOWS_ALL); @@ -82,6 +86,8 @@ protected: protected: LLTextBox* mTitleBox; + const LLFontGL* mFont; + S32 mLabelVPad; private: LLRect mButtonsRect; diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 52a5e3dbd6..62c5f60015 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -183,8 +183,10 @@ LLFloater::Params::Params() show_title("show_title", true), auto_close("auto_close", false), positioning("positioning", LLFloaterEnums::POSITIONING_RELATIVE), + header_font("header_font", LLFontGL::getFontSansSerif()), header_height("header_height", 0), legacy_header_height("legacy_header_height", 0), + header_vpad("header_vpad", 7), close_image("close_image"), restore_image("restore_image"), minimize_image("minimize_image"), @@ -293,7 +295,7 @@ LLFloater::LLFloater(const LLSD& key, const LLFloater::Params& p) memset(mButtonsEnabled, 0, BUTTON_COUNT * sizeof(bool)); memset(mButtons, 0, BUTTON_COUNT * sizeof(LLButton*)); - addDragHandle(); + addDragHandle(p); addResizeCtrls(); initFromParams(p); @@ -336,7 +338,7 @@ void LLFloater::initFloater(const Params& p) } } -void LLFloater::addDragHandle() +void LLFloater::addDragHandle(const LLFloater::Params& floater_params) { if (!mDragHandle) { @@ -346,6 +348,8 @@ void LLFloater::addDragHandle() p.name("drag"); p.follows.flags(FOLLOWS_ALL); p.label(mTitle); + p.font(floater_params.header_font); + p.label_vpad(floater_params.header_vpad); mDragHandle = LLUICtrlFactory::create(p); } else // drag on top @@ -354,6 +358,8 @@ void LLFloater::addDragHandle() p.name("Drag Handle"); p.follows.flags(FOLLOWS_ALL); p.label(mTitle); + p.font(floater_params.header_font); + p.label_vpad(floater_params.header_vpad); mDragHandle = LLUICtrlFactory::create(p); } addChild(mDragHandle); diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 9e1594bdd2..bda2531b43 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -172,8 +172,10 @@ public: Optional positioning; + Optional header_font; Optional header_height, - legacy_header_height; // HACK see initFromXML() + legacy_header_height, // HACK see initFromXML() + header_vpad; Optional rel_x, rel_y; @@ -442,7 +444,7 @@ private: bool offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButton index); void addResizeCtrls(); void layoutResizeCtrls(); - void addDragHandle(); + void addDragHandle(const LLFloater::Params& p); void layoutDragHandle(); // repair layout static void updateActiveFloaterTransparency(); diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 5a1a1187a0..8c8a6ebd4d 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -12273,17 +12273,6 @@ Value 0 - UIFloaterTitleVPad - - Comment - Distance from top of floater to top of title string, pixels - Persist - 1 - Type - S32 - Value - 7 - UIImgDefaultEyesUUID Comment diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index 11758556d6..f72c9a14fb 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -9,7 +9,9 @@ bg_alpha_image="Window_Background" background_visible="true" background_opaque="false" + header_font="SansSerif" header_height="25" + header_vpad="7" close_image="Icon_Close_Foreground" restore_image="Icon_Restore_Foreground" minimize_image="Icon_Minimize_Foreground" -- cgit v1.3 From 343190399399a3b1d5ce64739163163e32ab1a1f Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Tue, 27 Jan 2026 00:02:44 +0200 Subject: Restore DejaVuSans as a fallback, but alter size --- indra/llrender/llfontregistry.cpp | 22 ++++++++++++++-------- indra/llrender/llfontregistry.h | 15 +++++++++++---- indra/newview/skins/default/xui/en/fonts.xml | 10 ++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 777bba3f25..370b08319f 100644 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -181,16 +181,16 @@ LLFontDescriptor LLFontDescriptor::normalize() const return LLFontDescriptor(new_name,new_size,new_style, getFontFiles(), getFontCollectionFiles()); } -void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) +void LLFontDescriptor::addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr)); } -void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor) +void LLFontDescriptor::addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor) { char_functor_map_t::const_iterator it = mCharFunctors.find(char_functor); - mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, (mCharFunctors.end() != it) ? it->second : nullptr)); + mFontCollectionFiles.push_back(LLFontFileInfo(file_name, hinting, flags, size_delta, (mCharFunctors.end() != it) ? it->second : nullptr)); } LLFontRegistry::LLFontRegistry(bool create_gl_textures) @@ -329,17 +329,23 @@ bool font_desc_init_from_xml(LLXMLNodePtr node, LLFontDescriptor& desc) } } + F32 size_delta = 0.f; + if (child->hasAttribute("size_delta")) + { + child->getAttributeF32("size_delta", size_delta); + } + if (child->hasAttribute("load_collection")) { bool col = false; child->getAttributeBOOL("load_collection", col); if (col) { - desc.addFontCollectionFile(font_file_name, hinting, flags, char_functor); + desc.addFontCollectionFile(font_file_name, hinting, flags, size_delta, char_functor); } } - desc.addFontFile(font_file_name, hinting, flags, char_functor); + desc.addFontFile(font_file_name, hinting, flags, size_delta, char_functor); } else if (child->hasName("os")) { @@ -496,7 +502,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) // Add ultimate fallback list - generated dynamically on linux, // null elsewhere. std::transform(getUltimateFallbackList().begin(), getUltimateFallbackList().end(), std::back_inserter(font_files), - [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0); }); + [](const std::string& file_name) { return LLFontFileInfo(file_name, EFontHinting::FORCE_AUTOHINT, 0, 0.f); }); // Load fonts based on names. if (font_files.empty()) @@ -551,7 +557,7 @@ LLFontGL *LLFontRegistry::createFont(const LLFontDescriptor& desc) { fontp = new LLFontGL; } - if (fontp->loadFace(font_path, point_size_scale, + if (fontp->loadFace(font_path, point_size_scale + font_file_it->mSizeDelta, LLFontGL::sVertDPI, LLFontGL::sHorizDPI, is_fallback, i, font_file_it->mHinting, font_file_it->mFlags)) { is_font_loaded = true; diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index bf190d903c..a5fa9f338a 100644 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -43,19 +43,21 @@ enum class EFontHinting : S32 struct LLFontFileInfo { - LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, const std::function& char_functor = nullptr) + LLFontFileInfo(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::function& char_functor = nullptr) : FileName(file_name) , CharFunctor(char_functor) , mHinting(hinting) , mFlags(flags) + , mSizeDelta(size_delta) { } - LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags) + LLFontFileInfo(const LLFontFileInfo& ffi, EFontHinting hinting, S32 flags, F32 size_delta) : FileName(ffi.FileName) , CharFunctor(ffi.CharFunctor) , mHinting(hinting) , mFlags(flags) + , mSizeDelta(size_delta) { } @@ -63,6 +65,11 @@ struct LLFontFileInfo std::function CharFunctor; EFontHinting mHinting; S32 mFlags; + + // Not all fonts are the same size, Ex: dejavu is bigger than inter, + // so in some cases we want to adjust relative sizes to make characters + // from different files match. + F32 mSizeDelta; }; typedef std::vector font_file_info_vec_t; @@ -84,10 +91,10 @@ public: const std::string& getSize() const { return mSize; } void setSize(const std::string& size) { mSize = size; } - void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); + void addFontFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t & getFontFiles() const { return mFontFiles; } void setFontFiles(const font_file_info_vec_t& font_files) { mFontFiles = font_files; } - void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, const std::string& char_functor = LLStringUtil::null); + void addFontCollectionFile(const std::string& file_name, EFontHinting hinting, S32 flags, F32 size_delta, const std::string& char_functor = LLStringUtil::null); const font_file_info_vec_t& getFontCollectionFiles() const { return mFontCollectionFiles; } void setFontCollectionFiles(const font_file_info_vec_t& font_collection_files) { mFontCollectionFiles = font_collection_files; } diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index de8e640455..e85ac6c08c 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -5,6 +5,7 @@ name="default" comment="default font files (global fallbacks)"> Inter_18pt-Regular.ttf + DejaVuSans.ttf TwemojiSVG.ttf meiryo.TTC @@ -37,6 +38,7 @@ name="SansSerifBold" comment="Name of bold sans-serif font"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf arialbd.ttf @@ -49,6 +51,7 @@ name="SansSerif" comment="Name of san-serif font (Truetype file name)"> Inter_18pt-Regular.ttf + DejaVuSans.ttf arial.ttf @@ -62,6 +65,7 @@ comment="Name of bold sans-serif font" font_style="BOLD"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf Inter_18pt-Italic.ttf + DejaVuSans-Oblique.ttf Inter_18pt-BoldItalic.ttf + DejaVuSans-BoldOblique.ttf Inter_18pt-Regular.ttf + DejaVuSans.ttf arial.ttf @@ -129,6 +136,7 @@ comment="Name of Helvetica font (bold)" font_style="BOLD"> Inter_18pt-SemiBold.ttf + DejaVuSans-Bold.ttf arialbd.ttf @@ -142,6 +150,7 @@ comment="Name of Helvetica font (italic)" font_style="ITALIC"> Inter_18pt-Italic.ttf + DejaVuSans-Oblique.ttf ariali.ttf @@ -155,6 +164,7 @@ comment="Name of Helvetica font (bold italic)" font_style="BOLD|ITALIC"> Inter_18pt-BoldItalic.ttf + DejaVuSans-BoldOblique.ttf arialbi.ttf -- cgit v1.3 From d8884d50573ddf4643ea2c9694f53c22dd0ee5fd Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Sat, 31 Jan 2026 05:52:06 +0200 Subject: Steeltoe's XUI changes --- indra/newview/skins/default/xui/en/fonts.xml | 44 ++++++++++++---------- .../skins/default/xui/en/panel_edit_shape.xml | 4 +- indra/newview/skins/default/xui/en/panel_login.xml | 3 +- .../skins/default/xui/en/panel_status_bar.xml | 4 +- .../skins/default/xui/en/sidepanel_appearance.xml | 4 +- .../skins/default/xui/en/widgets/accordion_tab.xml | 1 + .../default/xui/en/widgets/folder_view_item.xml | 17 +++++---- .../skins/default/xui/en/widgets/tab_container.xml | 5 ++- .../xui/en/widgets/wearable_outfit_list_item.xml | 4 +- 9 files changed, 48 insertions(+), 38 deletions(-) diff --git a/indra/newview/skins/default/xui/en/fonts.xml b/indra/newview/skins/default/xui/en/fonts.xml index e85ac6c08c..d6f50332d0 100644 --- a/indra/newview/skins/default/xui/en/fonts.xml +++ b/indra/newview/skins/default/xui/en/fonts.xml @@ -37,8 +37,8 @@ - Inter_18pt-SemiBold.ttf - DejaVuSans-Bold.ttf + Inter_18pt-ExtraBold.ttf + DejaVuSans-Bold.ttf arialbd.ttf @@ -64,7 +64,7 @@ name="SansSerif" comment="Name of bold sans-serif font" font_style="BOLD"> - Inter_18pt-SemiBold.ttf + Inter_18pt-Bold.ttf DejaVuSans-Bold.ttf @@ -135,7 +135,7 @@ name="Helvetica" comment="Name of Helvetica font (bold)" font_style="BOLD"> - Inter_18pt-SemiBold.ttf + Inter_18pt-ExtraBold.ttf DejaVuSans-Bold.ttf arialbd.ttf @@ -181,26 +181,30 @@ + comment="Size for monospaced font (points, or 1/72 of an inch)" + size="8.0" + /> + comment="Size of huge font (points, or 1/72 of an inch)" + size="16.0" + /> + comment="Size of large font (points, or 1/72 of an inch)" + size="11.0" + /> + comment="Size of medium font (points, or 1/72 of an inch)" + size="10" + /> - + + diff --git a/indra/newview/skins/default/xui/en/panel_edit_shape.xml b/indra/newview/skins/default/xui/en/panel_edit_shape.xml index c1d743c3da..2bd25b43bd 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_shape.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_shape.xml @@ -15,7 +15,7 @@ White background_visible="true" bg_opaque_color="DkGray2" left="10" - top="5" + top="0" follows="left|top|right" layout="topleft" width="307" @@ -58,7 +58,7 @@ width="333"> follows="top|left|right" layout="topleft" left="5" - top="3" + top="0" mouse_opaque="false" name="currentlook_status" > (Status) diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index 53d1e18a84..6509c8c1f3 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -11,4 +11,5 @@ header_image_focused="Accordion_Selected" header_text_color="AccordionHeaderTextColor" font="SansSerif" + font.size="Small" /> diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index eed50ed5ed..bcc7772681 100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -3,18 +3,21 @@ folder_arrow_image="Folder_Arrow" favorite_image="Inv_Favorite_Star_Full" favorite_content_image="Inv_Favorite_Star_Content" - folder_indentation="8" - item_height="20" + folder_indentation="10" + item_height="21" item_top_pad="4" - selection_image="Square_Selection" + selection_image="Rounded_Square" mouse_opaque="true" follows="left|top|right" left_pad="5" - icon_pad="2" + icon_pad="4" icon_width="16" - text_pad="1" + text_pad="3" text_pad_right="4" - text_pad_top="1" + text_pad_top="0" arrow_size="12" - arrow_pad_top="1" max_folder_item_overlap="2"/> + + diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index e3b9030280..63613d34cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -6,10 +6,11 @@ label_pad_left - padding to the left of tab button labels diff --git a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml index 0f927f8bb3..64be14a69c 100644 --- a/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/wearable_outfit_list_item.xml @@ -29,14 +29,14 @@ width="16" /> Date: Sat, 31 Jan 2026 07:25:05 +0200 Subject: Make floater tools use Dejavu with old font size --- .../newview/skins/default/xui/en/floater_tools.xml | 644 +++++++++++++++------ indra/newview/skins/default/xui/en/fonts.xml | 6 +- .../skins/default/xui/en/panel_tools_texture.xml | 256 ++++++-- .../skins/default/xui/en/widgets/accordion_tab.xml | 2 +- .../skins/default/xui/en/widgets/tab_container.xml | 2 +- 5 files changed, 671 insertions(+), 239 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index d3a872c9d5..c82ce7e8ba 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -84,11 +84,13 @@ left="10" name="button focus" tool_tip="Focus" - width="35"> - - + width="35" + font="DejaVu" + font.size="LSmall"> + + @@ -287,7 +311,9 @@ layout="topleft" left_pad="2" name="unlink_btn" - width="90"> + width="90" + font="DejaVu" + font.size="LSmall"> @@ -298,10 +324,12 @@ layout="topleft" left="143" name="checkbox uniform" - top="48" + top="47" label_text.wrap="true" label_text.width="100" - width="134" /> + width="134" + font="DejaVu" + font.size="LSmall" /> + width="134" + font="DejaVu" + font.size="LSmall" /> + width="134" + font="DejaVu" + font.size="LSmall"/> + width="60" + drop_down_button.font="DejaVu" + drop_down_button.font.size="LSmall"> + width="114" + font="DejaVu" + font.size="LSmall" > + width="90" + font="DejaVu" + font.size="LSmall"> Name: + width="90" + font="DejaVu" + font.size="LSmall"> Description: + width="90" + font="DejaVu" + font.size="LSmall"> Creator: + width="90" + font="DejaVu" + font.size="LSmall"> Owner: + width="75" + font="DejaVu" + font.size="LSmall"> Group: + width="23" + font="DejaVu" + font.size="LSmall" /> + width="87" + font="DejaVu" + font.size="LSmall" /> + width="100" + pad_bottom="2"> diff --git a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml index bbf881f3e4..6509c8c1f3 100644 --- a/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml +++ b/indra/newview/skins/default/xui/en/widgets/accordion_tab.xml @@ -11,5 +11,5 @@ header_image_focused="Accordion_Selected" header_text_color="AccordionHeaderTextColor" font="SansSerif" - font.size="Monospace" + font.size="Small" /> diff --git a/indra/newview/skins/default/xui/en/widgets/floater.xml b/indra/newview/skins/default/xui/en/widgets/floater.xml index f72c9a14fb..73c6dc5d7a 100644 --- a/indra/newview/skins/default/xui/en/widgets/floater.xml +++ b/indra/newview/skins/default/xui/en/widgets/floater.xml @@ -11,7 +11,7 @@ background_opaque="false" header_font="SansSerif" header_height="25" - header_vpad="7" + header_vpad="5" close_image="Icon_Close_Foreground" restore_image="Icon_Restore_Foreground" minimize_image="Icon_Minimize_Foreground" diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index bcd3ed4e13..63613d34cb 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -10,7 +10,7 @@ label_pad_left - padding to the left of tab button labels use_custom_icon_ctrl="false" halign="center" font="SansSerif" - font.size="Monospace" + font.size="Small" tab_height="21" label_pad_bottom="1" label_pad_left="4"> -- cgit v1.3 From 04fbae21ab1d5d03d20cbf8290a04f8cf8e38baa Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 5 Feb 2026 19:50:44 +0200 Subject: Login button update and other color adjustments --- indra/llui/lldraghandle.cpp | 2 +- indra/newview/skins/default/colors.xml | 4 ++-- .../default/textures/widgets/PushButton_Login.png | Bin 1437 -> 18135 bytes .../textures/widgets/PushButton_Login_Over.png | Bin 1516 -> 18572 bytes .../textures/widgets/PushButton_Login_Pressed.png | Bin 1493 -> 18571 bytes indra/newview/skins/default/xui/en/panel_login.xml | 4 +++- 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/indra/llui/lldraghandle.cpp b/indra/llui/lldraghandle.cpp index d8d1791dca..b3b47084c5 100644 --- a/indra/llui/lldraghandle.cpp +++ b/indra/llui/lldraghandle.cpp @@ -106,7 +106,7 @@ void LLDragHandleTop::setTitle(const std::string& title) params.initial_value(trimmed_title); params.font(mFont); params.follows.flags(FOLLOWS_TOP | FOLLOWS_LEFT | FOLLOWS_RIGHT); - params.font_shadow(LLFontGL::DROP_SHADOW_SOFT); + params.font_shadow(LLFontGL::NO_SHADOW); params.use_ellipses = true; params.parse_urls = false; //cancel URL replacement in floater title mTitleBox = LLUICtrlFactory::create (params); diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml index d5a001c539..84e5518a03 100644 --- a/indra/newview/skins/default/colors.xml +++ b/indra/newview/skins/default/colors.xml @@ -10,7 +10,7 @@ value="0.3 0.82 1 0.13" /> + value="0.426 0.729 1.0 0.368" /> @@ -377,7 +377,7 @@ reference="Black_50" /> + value="0.7 0.7 0.7 1" /> diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login.png b/indra/newview/skins/default/textures/widgets/PushButton_Login.png index 8e7d932ab1..2180adb2fd 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Login.png and b/indra/newview/skins/default/textures/widgets/PushButton_Login.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png index 038ba23be2..e2c3b297df 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png and b/indra/newview/skins/default/textures/widgets/PushButton_Login_Over.png differ diff --git a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png index 828aa1a139..bf38c2cd75 100644 Binary files a/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png and b/indra/newview/skins/default/textures/widgets/PushButton_Login_Pressed.png differ diff --git a/indra/newview/skins/default/xui/en/panel_login.xml b/indra/newview/skins/default/xui/en/panel_login.xml index 21c4444c75..4eccdd2aef 100644 --- a/indra/newview/skins/default/xui/en/panel_login.xml +++ b/indra/newview/skins/default/xui/en/panel_login.xml @@ -165,7 +165,9 @@ label="Select grid" layout="topleft" name="server_combo" - width="149" /> + width="149" > + + Date: Fri, 6 Feb 2026 23:58:58 +0200 Subject: Adjust buttons and lists for font size being larger --- indra/llui/llmenugl.cpp | 17 ++++--- .../newview/skins/default/xui/en/floater_tools.xml | 52 ++++++++++++++-------- .../default/xui/en/panel_avatar_list_item.xml | 2 +- .../default/xui/en/panel_blocked_list_item.xml | 2 +- .../skins/default/xui/en/panel_chat_header.xml | 4 +- .../skins/default/xui/en/panel_group_list_item.xml | 2 +- indra/newview/skins/default/xui/en/panel_login.xml | 3 +- .../skins/default/xui/en/panel_login_first.xml | 3 +- .../default/xui/en/panel_performance_nearby.xml | 3 +- .../default/xui/en/panel_preferences_graphics1.xml | 3 +- .../skins/default/xui/en/widgets/button.xml | 2 +- .../en/widgets/conversation_view_participant.xml | 2 +- .../default/xui/en/widgets/folder_view_item.xml | 2 +- .../skins/default/xui/en/widgets/toolbar.xml | 1 + 14 files changed, 60 insertions(+), 38 deletions(-) diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index 6ba31c251e..3b21ed8f47 100644 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -73,7 +73,7 @@ S32 MENU_BAR_WIDTH = 410; /// Local function declarations, constants, enums, and typedefs ///============================================================================ -const S32 LABEL_BOTTOM_PAD_PIXELS = 2; +const S32 LABEL_BOTTOM_PAD_PIXELS = 1; const U32 LEFT_PAD_PIXELS = 3; const U32 LEFT_WIDTH_PIXELS = 15; @@ -519,21 +519,25 @@ void LLMenuItemGL::draw( void ) } else { + // Munus are all of the same size, so fixed offset works here, + // but it won't work if somebody decides to use different font + // todo: adjust logic to work of rect and font height + F32 y = (F32)MENU_ITEM_PADDING / 2.f; if( !mDrawBoolLabel.empty() ) { - mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color, + mFont->render( mDrawBoolLabel.getWString(), 0, (F32)LEFT_PAD_PIXELS, y, color, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false ); } - mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color, + mFont->render( mLabel.getWString(), 0, (F32)LEFT_PLAIN_PIXELS, y, color, LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false ); if( !mDrawAccelLabel.empty() ) { - mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color, + mFont->render( mDrawAccelLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PLAIN_PIXELS, y, color, LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false ); } if( !mDrawBranchLabel.empty() ) { - mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, ((F32)MENU_ITEM_PADDING / 2.f), color, + mFont->render( mDrawBranchLabel.getWString(), 0, (F32)getRect().mRight - (F32)RIGHT_PAD_PIXELS, y, color, LLFontGL::RIGHT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, NULL, false ); } } @@ -1638,6 +1642,9 @@ void LLMenuItemBranchDownGL::draw( void ) { color = mDisabledColor.get(); } + // Munus are all of the same size, so fixed offset works here, + // but it won't work if somebody decides to use different font + // todo: adjust logic to work of rect and font height getFont()->render( mLabel.getWString(), 0, (F32)getRect().getWidth() / 2.f, (F32)LABEL_BOTTOM_PAD_PIXELS, color, LLFontGL::HCENTER, LLFontGL::BOTTOM, LLFontGL::NORMAL); diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 6bbca72065..3c849162df 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -86,7 +86,8 @@ tool_tip="Focus" width="35" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -103,7 +104,8 @@ tool_tip="Move" width="35" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -120,7 +122,8 @@ tool_tip="Edit" width="35" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -137,7 +140,8 @@ tool_tip="Create" width="35" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -154,7 +158,8 @@ tool_tip="Land" width="35" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -300,7 +305,8 @@ name="link_btn" width="50" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -313,7 +319,8 @@ name="unlink_btn" width="90" font="DejaVu" - font.size="LSmall"> + font.size="LSmall" + pad_bottom="1"> @@ -1106,7 +1113,8 @@ tool_tip="Choose a group to share this object's permissions" width="23" font="DejaVu" - font.size="LSmall" /> + font.size="LSmall" + pad_bottom="1" /> + font.size="LSmall" + pad_bottom="1" /> + width="19" /> + font.size="LSmall" + pad_bottom="1" /> + width="100"> diff --git a/indra/newview/skins/default/xui/en/widgets/button.xml b/indra/newview/skins/default/xui/en/widgets/button.xml index 6836f9e636..c7669e81af 100644 --- a/indra/newview/skins/default/xui/en/widgets/button.xml +++ b/indra/newview/skins/default/xui/en/widgets/button.xml @@ -21,7 +21,7 @@ font="SansSerifSmall" hover_glow_amount="0.15" halign="center" - pad_bottom="1" + pad_bottom="2" height="23" scale_image="true" label_shadow="false" diff --git a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml index cf995e5833..ebe2fa07e2 100644 --- a/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml +++ b/indra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml @@ -9,7 +9,7 @@ left_pad="0" icon_pad="10" icon_width="20" - text_pad="7" + text_pad="5" text_pad_right="4" arrow_size="12" max_folder_item_overlap="2" diff --git a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml index bcc7772681..671cb37ca3 100644 --- a/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml +++ b/indra/newview/skins/default/xui/en/widgets/folder_view_item.xml @@ -12,7 +12,7 @@ left_pad="5" icon_pad="4" icon_width="16" - text_pad="3" + text_pad="5" text_pad_right="4" text_pad_top="0" arrow_size="12" diff --git a/indra/newview/skins/default/xui/en/widgets/toolbar.xml b/indra/newview/skins/default/xui/en/widgets/toolbar.xml index 8345911525..8d71ffbfb5 100644 --- a/indra/newview/skins/default/xui/en/widgets/toolbar.xml +++ b/indra/newview/skins/default/xui/en/widgets/toolbar.xml @@ -25,6 +25,7 @@ desired_height="24" pad_left="10" pad_right="10" + pad_bottom="1" follows="left|top" chrome="true" image_overlay_alignment="left" -- cgit v1.3 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 From 3d0e9234a9fc8ad6903b412eb2d5555f29cdaa78 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> Date: Mon, 9 Feb 2026 22:33:18 +0200 Subject: Make floater tools use Dejavu with old font size #2 --- indra/newview/skins/default/xui/en/floater_tools.xml | 4 ++-- indra/newview/skins/default/xui/en/panel_conversation_list_item.xml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 3c849162df..dd2839373c 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -877,8 +877,8 @@ open_tabs_on_drag_and_drop="true" top="173" width="295" - font="SansSerif" - font.size="Monospace"> + font="DejaVu" + font.size="LSmall"> @@ -86,6 +86,7 @@ auto_update="true" follows="top|right" draw_border="false" + top="6" height="16" layout="topleft" left_pad="5" -- cgit v1.3 From e39bddb96cd425cc0f6127cdfef69554a9b40e8a Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Tue, 10 Feb 2026 19:26:47 +0200 Subject: Increase height of Group inspect --- indra/newview/skins/default/xui/en/inspect_group.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/indra/newview/skins/default/xui/en/inspect_group.xml b/indra/newview/skins/default/xui/en/inspect_group.xml index eafa2886d2..226454df7c 100644 --- a/indra/newview/skins/default/xui/en/inspect_group.xml +++ b/indra/newview/skins/default/xui/en/inspect_group.xml @@ -9,7 +9,7 @@ bg_opaque_image="Inspector_Background" can_close="false" can_minimize="false" - height="178" + height="188" layout="topleft" name="inspect_group" single_instance="true" @@ -80,7 +80,7 @@ L$123 to join height="23" label="Join" left="8" - top="146" + top="156" name="join_btn" width="103" commit_callback.function="InspectGroup.Join"/> @@ -89,7 +89,7 @@ L$123 to join height="23" label="Leave" left="8" - top="146" + top="156" 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="146" + top="156" left="117" width="103" commit_callback.function="InspectGroup.ViewProfile" /> -- cgit v1.3 From 8e9a7187eb231b22f8c4fdc52227c2f09f0d507e Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 12 Feb 2026 14:20:39 +0200 Subject: Floaters and UI controls adjustments --- .../skins/default/xui/en/floater_bulk_perms.xml | 4 +- .../default/xui/en/floater_edit_hover_height.xml | 4 +- .../skins/default/xui/en/floater_font_test.xml | 2 +- .../skins/default/xui/en/floater_god_tools.xml | 56 +++++++++++----------- .../xui/en/floater_live_material_editor.xml | 6 +-- .../default/xui/en/floater_material_editor.xml | 6 +-- .../default/xui/en/floater_my_environments.xml | 9 ++-- .../xui/en/floater_new_feature_notification.xml | 4 +- .../skins/default/xui/en/floater_telehub.xml | 2 +- .../default/xui/en/floater_voice_chat_volume.xml | 2 +- .../default/xui/en/panel_experience_search.xml | 4 +- .../skins/default/xui/en/panel_gltf_material.xml | 12 ++--- .../default/xui/en/panel_preferences_setup.xml | 21 ++++---- .../default/xui/en/panel_preferences_sound.xml | 19 ++++---- .../default/xui/en/panel_region_experiences.xml | 1 - .../skins/default/xui/en/panel_region_general.xml | 8 ++-- .../skins/default/xui/en/panel_region_terrain.xml | 26 +++++----- .../default/xui/en/panel_settings_sky_atmos.xml | 4 +- 18 files changed, 97 insertions(+), 93 deletions(-) diff --git a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml index 7636284b4b..0c88f043fd 100644 --- a/indra/newview/skins/default/xui/en/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/en/floater_bulk_perms.xml @@ -291,7 +291,7 @@ height="16" label="Copy" layout="topleft" - top_pad="0" + top_pad="3" name="next_owner_copy" tool_tip="Next owner can make unlimited copies of this object. Copies maintain creator information, and can never be more permissive than the item being copied." width="92"> @@ -302,7 +302,7 @@ control_name="BulkChangeNextOwnerTransfer" enabled_control="BulkChangeNextOwnerCopy" height="16" - top_pad="0" + top_pad="3" initial_value="true" label="Transfer" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml index c831684594..41e8d3dc8a 100644 --- a/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml +++ b/indra/newview/skins/default/xui/en/floater_edit_hover_height.xml @@ -5,7 +5,7 @@ can_minimize="true" can_close="true" can_resize="false" - height="80" + height="84" width="515" layout="topleft" name="HoverHeight" @@ -39,6 +39,6 @@ label="Bind Camera view" layout="topleft" name="BindCameraCheck" - top_pad="7" + top_pad="14" width="237"/> diff --git a/indra/newview/skins/default/xui/en/floater_font_test.xml b/indra/newview/skins/default/xui/en/floater_font_test.xml index 61cb91e2f3..8070ed55e6 100644 --- a/indra/newview/skins/default/xui/en/floater_font_test.xml +++ b/indra/newview/skins/default/xui/en/floater_font_test.xml @@ -5,7 +5,7 @@ height="800" layout="topleft" min_height="175" - min_width="154" + min_width="390" name="contents" help_topic="contents" title="FONT TEST" diff --git a/indra/newview/skins/default/xui/en/floater_god_tools.xml b/indra/newview/skins/default/xui/en/floater_god_tools.xml index f8ec696af9..7097689118 100644 --- a/indra/newview/skins/default/xui/en/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_god_tools.xml @@ -6,7 +6,7 @@ name="godtools floater" help_topic="godtools_floater" title="GOD TOOLS" - width="400"> + width="410"> + width="410"> + width="294"> @@ -233,13 +233,13 @@ border_style="line" border_thickness="1" follows="top|right" - height="16" + height="18" layout="topleft" - left_delta="108" + left_delta="90" max_length_bytes="10" name="estate" top_delta="0" - width="50" /> + width="100" /> Parent ID: @@ -257,14 +257,14 @@ border_style="line" border_thickness="1" follows="top|right" - height="16" + height="18" layout="topleft" - left_delta="108" + left_delta="90" max_length_bytes="10" name="parentestate" tool_tip="This is the parent estate for this region" top_delta="0" - width="50"> + width="100"> @@ -276,22 +276,22 @@ layout="topleft" left="200" name="Grid Pos: " - top_pad="4" - width="190"> + top_pad="7" + width="90"> Grid Pos: + width="46"> @@ -299,14 +299,14 @@ border_style="line" border_thickness="1" follows="top|right" - height="16" + height="18" layout="topleft" - left_pad="10" + left_pad="8" max_length_bytes="10" name="gridposy" tool_tip="This is the grid y position for this region" top_delta="0" - width="40"> + width="46"> @@ -318,20 +318,20 @@ layout="topleft" left="200" name="Redirect to Grid: " - top_pad="4" - width="88"> + top_pad="7" + width="90"> Redirect to Grid: + width="46"> @@ -339,13 +339,13 @@ border_style="line" border_thickness="1" follows="top|right" - height="16" + height="18" layout="topleft" - left_pad="10" + left_pad="8" max_length_bytes="10" name="redirecty" top_delta="0" - width="40"> + width="46"> @@ -407,10 +407,10 @@ label="Refresh" label_selected="Refresh" layout="topleft" - left="278" + left="280" name="Refresh" tool_tip="Click here to refresh the above information" - top_pad="10" + top_pad="14" width="110"> diff --git a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml index 5b7dab6a52..a104923f8d 100644 --- a/indra/newview/skins/default/xui/en/floater_live_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_live_material_editor.xml @@ -4,9 +4,9 @@ can_resize="true" default_tab_group="1" height="790" - width="256" + width="267" min_height="500" - min_width="256" + min_width="267" layout="topleft" name="material editor" help_topic="material_editor" @@ -17,7 +17,7 @@ top="18" left="4" height="768" - width="250" + width="261" follows="all" layout="topleft" color="DkGray2" diff --git a/indra/newview/skins/default/xui/en/floater_material_editor.xml b/indra/newview/skins/default/xui/en/floater_material_editor.xml index 21ceeafeea..f894e94622 100644 --- a/indra/newview/skins/default/xui/en/floater_material_editor.xml +++ b/indra/newview/skins/default/xui/en/floater_material_editor.xml @@ -4,9 +4,9 @@ can_resize="true" default_tab_group="1" height="891" - width="256" + width="267" min_height="500" - min_width="256" + min_width="267" layout="topleft" name="material editor" help_topic="material_editor" @@ -20,7 +20,7 @@ top="18" left="4" height="768" - width="250" + width="261" follows="all" layout="topleft" color="DkGray2" diff --git a/indra/newview/skins/default/xui/en/floater_my_environments.xml b/indra/newview/skins/default/xui/en/floater_my_environments.xml index 8c9c450d7c..d85c0d84bf 100644 --- a/indra/newview/skins/default/xui/en/floater_my_environments.xml +++ b/indra/newview/skins/default/xui/en/floater_my_environments.xml @@ -41,6 +41,7 @@ mouse_opaque="true" name="icon_settingsdays" left="4" + top="6" width="16" /> Enter part of the name: + width="257"> Roughness Factor @@ -273,7 +273,7 @@ Software updates: @@ -180,7 +180,7 @@ height="23" layout="topleft" left_delta="50" - top_pad="5" + top_pad="10" name="updater_service_combobox" width="300"> + width="400"/> + width="400"/> Proxy Settings: @@ -242,8 +242,7 @@ layout="topleft" left_delta="50" name="set_proxy" - top_pad="5" - > + top_pad="10" > diff --git a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml index ab5709e8ee..af3b2d6cb5 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_sound.xml @@ -319,7 +319,7 @@ top_delta="25" name="Listen media from" height="15" - width="165" + width="175" halign="right"> Hear media and sounds from @@ -346,7 +346,7 @@ layout="topleft" height="15" left="23" - width="165" + width="175" name="media_autoplay_label" halign="right"> Auto-play media @@ -357,7 +357,7 @@ follows="left|top" layout="topleft" height="23" - left_delta="170" + left_delta="180" top_delta="-4" name="media_auto_play_combo" width="130"> @@ -379,7 +379,7 @@ layout="topleft" height="15" left="23" - width="165" + width="175" name="media_firstinteract_label" halign="right"> Media first-interact @@ -390,11 +390,12 @@ follows="left|top" layout="topleft" height="23" - left_delta="170" + left_delta="180" top_delta="-4" width="130" name="media_first_interact_combo" tool_tip="This setting controls which media (once loaded) does not require a first click to focus before interaction can begin. This allows clicks to be passed directly to media bypassing the focus click requirement. Each option also inherits the previous ones."> + Hear voice from @@ -513,7 +514,7 @@ control_name="VoiceEarLocation" follows="left|top" layout="topleft" - left_delta="170" + left_delta="180" top_delta="-6" width="130" height="23" diff --git a/indra/newview/skins/default/xui/en/panel_region_experiences.xml b/indra/newview/skins/default/xui/en/panel_region_experiences.xml index 199dca4853..5e9ebabba7 100644 --- a/indra/newview/skins/default/xui/en/panel_region_experiences.xml +++ b/indra/newview/skins/default/xui/en/panel_region_experiences.xml @@ -13,7 +13,6 @@ Any Experience may be Key. - Key Experiences have permission to run on this estate. Additionally, if the estate does not allow public access, Residents participating in any Key Experience may enter the estate and can remain as long as they are in a Key Experience. diff --git a/indra/newview/skins/default/xui/en/panel_region_general.xml b/indra/newview/skins/default/xui/en/panel_region_general.xml index 47e1e669d1..4e624276cc 100644 --- a/indra/newview/skins/default/xui/en/panel_region_general.xml +++ b/indra/newview/skins/default/xui/en/panel_region_general.xml @@ -67,12 +67,12 @@ unknown @@ -81,7 +81,7 @@ font="SansSerif" height="20" layout="topleft" - top_delta="0" + top_delta="-1" right="-100" name="grid_position_lbl" width="80"> diff --git a/indra/newview/skins/default/xui/en/panel_region_terrain.xml b/indra/newview/skins/default/xui/en/panel_region_terrain.xml index 73e0a1000f..dd9907dc1f 100644 --- a/indra/newview/skins/default/xui/en/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/en/panel_region_terrain.xml @@ -42,7 +42,7 @@ max_val="100" name="water_height_spin" top="40" - width="180" /> + width="190" /> + width="190" /> + width="190" /> @@ -349,7 +349,7 @@ min_val="-500" name="height_start_spin_1" top_delta="15" - width="100" /> + width="105" /> + width="105" /> + width="105" /> + width="105" /> @@ -425,7 +425,7 @@ min_val="-500" name="height_start_spin_0" top_delta="15" - width="100" /> + width="105" /> + width="105" /> + width="105" /> + width="105" />