griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: layout panels headers don't take block width into account

Browse Source 
Found while working on #116472.
This commit is contained in:
Jacques Lucke
2023-12-22 22:14:06 +01:00
parent 079a752a20
commit db8d381f71
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/editors/interface/interface_layout.cc
View File

@@ -4206,7 +4206,7 @@ static void ui_litem_layout_panel_header(uiLayout *litem)
int w, h;
ui_item_size(item, &w, &h);
litem->y -= h;
ui_item_position(item, litem->x, litem->y, w, h);
ui_item_position(item, litem->x, litem->y, litem->w, h);
panel->runtime->layout_panels.headers.append({float(litem->y),
float(litem->y + litem->h),
@@ -4993,14 +4993,16 @@ uiLayout *uiLayoutPanel(const bContext *C,
UI_block_layout_set_current(layout->root->block, litem);
uiBlock *block = uiLayoutGetBlock(layout);
const int icon = is_open ? ICON_DOWNARROW_HLT : ICON_RIGHTARROW;
const int width = ui_text_icon_width(layout, name, icon, false);
uiDefIconTextBut(block,
UI_BTYPE_LABEL,
0,
is_open ? ICON_DOWNARROW_HLT : ICON_RIGHTARROW,
IFACE_(name),
icon,
name,
0,
0,
UI_UNIT_X * 4,
width,
UI_UNIT_Y * 1.2f,
nullptr,
0.0,