From 35f94f7042d562ced36f3c04c9dc71f9903182a3 Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> 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