blender/blender
150
479
Fork 710
Code Issues 6.8k Pull Requests 896 Projects 18 Wiki Activity

UI: Outliner "File Mode" Manage User Count #118691

Merged
Harley Acheson merged 10 commits from Harley/blender:OutlinerUserCount into main 2024-04-20 02:50:21 +02:00
Conversation 53 Commits 10 Files Changed 6 +33 -25
3 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9d25001ce5 - Show all commits

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

@ -1680,6 +1680,7 @@ int UI_search_items_find_index(uiSearchItems *items, const char *name);
* Adds a hint to the button which draws right aligned, grayed out and never clipped.
*/
void UI_but_hint_drawstr_set(uiBut *but, const char *string);
void UI_but_icon_indicator_set(uiBut *but, const const char *string);
void UI_but_icon_indicator_number_set(uiBut *but, const int indicator_number);
void UI_but_node_link_set(uiBut *but, bNodeSocket *socket, const float draw_color[4]);

5
source/blender/editors/interface/interface.cc
View File

@ -6231,6 +6231,11 @@ void UI_but_hint_drawstr_set(uiBut *but, const char *string)
ui_but_add_shortcut(but, string, false);
}
void UI_but_icon_indicator_set(uiBut *but, const char *string)
{
STRNCPY(but->icon_overlay_text.text, string);
}
void UI_but_icon_indicator_number_set(uiBut *but, const int indicator_number)
{
UI_icon_text_overlay_init_from_count(&but->icon_overlay_text, indicator_number);

52
source/blender/editors/space_outliner/outliner_draw.cc
View File

@ -1761,36 +1761,30 @@ static void outliner_draw_userbuts(uiBlock *block,
}
uiBut *bt;
char buf[BLI_STR_FORMAT_INT32_GROUPED_SIZE] = "";
int but_flag = UI_BUT_DRAG_LOCK;
const char *tip = nullptr;
const int real_users = id->us - ID_FAKE_USERS(id);
const bool has_fake_user = id->flag & LIB_FAKEUSER;
const bool is_linked = ID_IS_LINKED(id);
const bool is_object = GS(id->name) == ID_OB;
char overlay[5];
BLI_str_format_integer_unit(overlay, id->us);
if (is_linked) {
but_flag |= UI_BUT_DISABLED;
if (is_object) {
bt = uiDefBut(block,
UI_BTYPE_BUT,
0,
overlay,
int(region->v2d.cur.xmax - OL_TOG_USER_BUTS_STATUS),
te->ys,
UI_UNIT_X,
UI_UNIT_Y,
nullptr,
0.0,
0.0,
TIP_("Number of users"));
}
else {
/* Number of users in first column. */
BLI_str_format_int_grouped(buf, id->us);
bt = uiDefBut(block,
UI_BTYPE_BUT,
1,
buf,
int(region->v2d.cur.xmax - OL_TOG_USER_BUTS_USERS),
te->ys,
UI_UNIT_X,
UI_UNIT_Y,
nullptr,
0.0,
0.0,
TIP_("Number of users"));
UI_but_flag_enable(bt, but_flag);
/* Fake User shield toggle in second column. */
if (!is_object) {
const char *tip = nullptr;
if (has_fake_user) {
tip = is_linked ? TIP_("Item is protected from deletion") :
TIP_("Click to remove protection from deletion");
@ -1820,8 +1814,16 @@ static void outliner_draw_userbuts(uiBlock *block,
0,
0,
tip);
UI_but_func_set(bt, restrictbutton_id_user_toggle, id, nullptr);
UI_but_flag_enable(bt, but_flag);
if (is_linked) {
UI_but_flag_enable(bt, UI_BUT_DISABLED);
}
else {
UI_but_func_set(bt, restrictbutton_id_user_toggle, id, nullptr);
UI_but_flag_enable(bt, UI_BUT_DRAG_LOCK);
}
UI_but_icon_indicator_set(bt, overlay);
}
});
}