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 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/llui/lldraghandle.cpp') 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); -- 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(-) (limited to 'indra/llui/lldraghandle.cpp') 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" > + +