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

Refactor: UI: Avoid confusing layout property split return value

Browse Source 
The function would return two very different layouts in different code
paths, making it not clear to the caller what to expect. For one code
path the return value was rather useless, and in fact unused, so I was
able to just remove this. Also clarified behavior and return values in
the function API comment.
This commit is contained in:
Julian Eisel
2024-09-20 12:29:14 +02:00
parent a3a5793a28
commit 7d97f99dfc
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/include/UI_interface_c.hh
View File

@@ -3072,7 +3072,11 @@ uiPropertySplitWrapper uiItemPropertySplitWrapperCreate(uiLayout *parent_layout)
void uiItemL(uiLayout *layout, const char *name, int icon); /* label */
uiBut *uiItemL_ex(uiLayout *layout, const char *name, int icon, bool highlight, bool redalert);
/**
* Helper to add a label and creates a property split layout if needed.
* Helper to add a label using a property split layout if needed. After calling this the
* active layout will be the one to place the labeled items in. An additional layout may be
* returned to place decorator buttons in.
*
* \return the layout to place decorators in, if #UI_ITEM_PROP_SEP is enabled. Otherwise null.
*/
uiLayout *uiItemL_respect_property_split(uiLayout *layout, const char *text, int icon);
/**

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

@@ -3360,7 +3360,7 @@ uiLayout *uiItemL_respect_property_split(uiLayout *layout, const char *text, int
}
uiItemL_(layout, text, icon);
return layout;
return nullptr;
}
void uiItemLDrag(uiLayout *layout, PointerRNA *ptr, const char *name, int icon)