From 433a84d706b279083887d7ed7dafc63d80b0fe0e Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 7 Mar 2024 11:20:08 -0800 Subject: [PATCH 1/2] UI: Popover Button Padding for Arrow Currently UI_BTYPE_POPOVER with icon and without text will get enough extra padding to fit a downward arrow, only if in a header region. This PR allows it to get the same padding in panels. --- source/blender/editors/interface/interface_layout.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 29b000aa6be..a28aea0a324 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -2994,7 +2994,10 @@ static uiBut *ui_item_menu(uiLayout *layout, } uiTextIconPadFactor pad_factor = ui_text_pad_compact; - if (layout->root->type == UI_LAYOUT_HEADER) { /* Ugly! */ + /* Ugly! Extra padding in specific circumstances. */ + if (layout->root->type == UI_LAYOUT_HEADER || + (layout->root->type == UI_LAYOUT_PANEL && force_menu)) + { if (icon == ICON_NONE && force_menu) { /* pass */ } -- 2.30.2 From c0d812619096d50e1bc82ccf4eb578f8971e8cd6 Mon Sep 17 00:00:00 2001 From: Harley Acheson Date: Thu, 7 Mar 2024 12:05:59 -0800 Subject: [PATCH 2/2] a little less conservative --- source/blender/editors/interface/interface_layout.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index a28aea0a324..3e8d9f15b33 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -2995,9 +2995,7 @@ static uiBut *ui_item_menu(uiLayout *layout, uiTextIconPadFactor pad_factor = ui_text_pad_compact; /* Ugly! Extra padding in specific circumstances. */ - if (layout->root->type == UI_LAYOUT_HEADER || - (layout->root->type == UI_LAYOUT_PANEL && force_menu)) - { + if (layout->root->type == UI_LAYOUT_HEADER || force_menu) { if (icon == ICON_NONE && force_menu) { /* pass */ } -- 2.30.2