blender
/
blender
136
407
Fork 591
Code Issues 6.3k Pull Requests 776 Projects 19 Wiki Activity

UI: Remove Colons from Property Names #113797

Merged
Harley Acheson merged 3 commits from Harley/blender:BanishColons into main 2023-10-19 18:08:31 +02:00
Conversation 2 Commits 3 Files Changed 2 +3 -38
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,20 +211,6 @@ struct uiLayoutItemRoot {
/** \name Item
* \{ */
static const char *ui_item_name_add_colon(const char *name, char namestr[UI_MAX_NAME_STR])
{
const int len = strlen(name);
if (len != 0 && len + 1 < UI_MAX_NAME_STR) {
memcpy(namestr, name, len);
namestr[len] = ':';
namestr[len + 1] = '\0';
return namestr;
}
return name;
}
static int ui_item_fit(
int item, int pos, int all, int available, bool is_last, int alignment, float *extra_pixel)
{
@ -2068,7 +2054,6 @@ void uiItemFullR(uiLayout *layout,
const char *placeholder)
{
uiBlock *block = layout->root->block;
char namestr[UI_MAX_NAME_STR];
const bool use_prop_sep = ((layout->item.flag & UI_ITEM_PROP_SEP) != 0);
const bool inside_prop_sep = ((layout->item.flag & UI_ITEM_INSIDE_PROP_SEP) != 0);
/* Columns can define a heading to insert. If the first item added to a split layout doesn't have
@ -2128,24 +2113,15 @@ void uiItemFullR(uiLayout *layout,
/* pass */
}
else if (ELEM(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_POINTER)) {
if (use_prop_sep == false) {
name = ui_item_name_add_colon(name, namestr);
}
/* pass */
}
else if (type == PROP_BOOLEAN && is_array && index == RNA_NO_INDEX) {
if (use_prop_sep == false) {
name = ui_item_name_add_colon(name, namestr);
}
/* pass */
}
else if (type == PROP_ENUM && index != RNA_ENUM_VALUE) {
if (flag & UI_ITEM_R_COMPACT) {
name = "";
}
else {
if (use_prop_sep == false) {
name = ui_item_name_add_colon(name, namestr);
}
}
}
if (no_icon == false) {
@ -2881,8 +2857,6 @@ void uiItemPointerR_prop(uiLayout *layout,
int icon,
bool results_are_suggestions)
{
const bool use_prop_sep = ((layout->item.flag & UI_ITEM_PROP_SEP) != 0);
ui_block_new_button_group(uiLayoutGetBlock(layout), uiButtonGroupFlag(0));
const PropertyType type = RNA_property_type(prop);
@ -2915,11 +2889,6 @@ void uiItemPointerR_prop(uiLayout *layout,
name = RNA_property_ui_name(prop);
}
char namestr[UI_MAX_NAME_STR];
if (use_prop_sep == false) {
name = ui_item_name_add_colon(name, namestr);
}
/* create button */
uiBlock *block = uiLayoutGetBlock(layout);
@ -3365,10 +3334,6 @@ uiLayout *uiItemL_respect_property_split(uiLayout *layout, const char *text, int
return split_wrapper.decorate_column;
}
char namestr[UI_MAX_NAME_STR];
if (text) {
text = ui_item_name_add_colon(text, namestr);
}
uiItemL_(layout, text, icon);
return layout;

2
source/blender/editors/space_view3d/view3d_buttons.cc
View File

@ -1245,7 +1245,7 @@ static void v3d_object_dimension_buts(bContext *C, uiLayout *layout, View3D *v3d
uiDefBut(block,
UI_BTYPE_LABEL,
0,
IFACE_("Dimensions:"),
IFACE_("Dimensions"),
0,
yi -= buth,
butw,