dillongoostudios/goo-engine
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: show '+ New' button in Action Slot selector when no slot is selected

Browse Source 
In any Action Slot selector, when there is no slot selected yet, replace
the 'Duplicate' and 'Unassign' buttons with a large 'New' button. This
is consistent with the ID selector, which does the same thing.

Care is taken to ensure this is only applied to the use case of
selecting Action Slots, in order to minimize the UI changes in Blender
4.4.

The only other use case of `template_search()` that I could find, is the
View Layer selector in the top-right corner of the window. However, even
without the "_is this an Action Slot selector_" guard, it would not show
these changes, as Blender guarantees there is always a view layer
assigned. Add-ons may still use `template_search()` in other ways,
though, so it's still good to keep this guard in place.

Pull Request: https://projects.blender.org/blender/blender/pulls/135443
This commit is contained in:
Sybren A. Stüvel
2025-03-05 12:20:11 +01:00
parent 326ce59961
commit a03077c22d
1 changed files with 46 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/editors/interface/templates/interface_template_search.cc
+46 -10
View File
@@ -11,6 +11,8 @@
#include "RNA_access.hh"
#include "RNA_prototypes.hh"
#include "BLT_translation.hh"
#include "UI_interface.hh"
#include "interface_intern.hh"
#include "interface_templates_intern.hh"
@@ -104,18 +106,40 @@ static void template_search_add_button_name(uiBlock *block,
uiDefAutoButR(block, active_ptr, name_prop, 0, "", ICON_NONE, 0, 0, width, height);
}
static void template_search_add_button_operator(uiBlock *block,
const char *const operator_name,
const wmOperatorCallContext opcontext,
const int icon,
const bool editable)
static void template_search_add_button_operator(
uiBlock *block,
const char *const operator_name,
const wmOperatorCallContext opcontext,
const int icon,
const bool editable,
const std::optional<StringRefNull> button_text = {})
{
if (!operator_name) {
return;
}
uiBut *but = uiDefIconButO(
block, UI_BTYPE_BUT, operator_name, opcontext, icon, 0, 0, UI_UNIT_X, UI_UNIT_Y, nullptr);
uiBut *but;
if (button_text) {
const int button_width = std::max(
UI_fontstyle_string_width(UI_FSTYLE_WIDGET, button_text->c_str()) + int(UI_UNIT_X * 1.5f),
UI_UNIT_X * 5);
but = uiDefIconTextButO(block,
UI_BTYPE_BUT,
operator_name,
opcontext,
icon,
*button_text,
0,
0,
button_width,
UI_UNIT_Y,
nullptr);
}
else {
but = uiDefIconButO(
block, UI_BTYPE_BUT, operator_name, opcontext, icon, 0, 0, UI_UNIT_X, UI_UNIT_Y, nullptr);
}
if (!editable) {
UI_but_drawflag_enable(but, UI_BUT_DISABLED);
@@ -153,9 +177,21 @@ static void template_search_buttons(const bContext *C,
template_search_add_button_searchmenu(C, row, block, template_search, editable, false);
template_search_add_button_name(block, &active_ptr, type);
template_search_add_button_operator(
block, newop, WM_OP_INVOKE_DEFAULT, ICON_DUPLICATE, editable);
template_search_add_button_operator(block, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, editable);
/* For Blender 4.4, the "New" button is only shown on Action Slot selectors.
* Blender 4.5 may have this enabled for all uses of this template, in which
* case this type-specific code will be removed. */
const bool may_show_new_button = (type == &RNA_ActionSlot);
if (may_show_new_button && !active_ptr.data) {
template_search_add_button_operator(
block, newop, WM_OP_INVOKE_DEFAULT, ICON_ADD, editable, IFACE_("New"));
}
else {
template_search_add_button_operator(
block, newop, WM_OP_INVOKE_DEFAULT, ICON_DUPLICATE, editable);
template_search_add_button_operator(
block, unlinkop, WM_OP_INVOKE_REGION_WIN, ICON_X, editable);
}
UI_block_align_end(block);