7682258ff9
This changes the ui-blocks buttons storage from Listbase to Vector. Major changes that might cause a performance considerations are in `ui_but_update_from_old_block` that requires to track buttons when restoring button state between block redraws or in `uiItemFullR` that may needs to insert uiButs in the middle of the vector to add decorators. This might not be as fast as removing or inserting elements in the middle of a listbase container. Also buttons currently don't know its position in the container, so to get the previous and next button its required to make a lookup of the button in the container. `UI_block_update_from_old> ui_but_update_from_old_block` restores the state of buttons between frames, this is done by sequentially testing if a button is the same as an old button, however since UI can be created procedurally some old buttons may not be drawn while editing other button data, this requires an extra track of what buttons may not match to a new button while comparing for restoring state, but still this buttons may be candidates to match to an new button. Not functional changes expected. Ref: #117604 Co-authored-by: Julian Eisel <julian@blender.org> Pull Request: https://projects.blender.org/blender/blender/pulls/127128
108 lines
3.1 KiB
C++
108 lines
3.1 KiB
C++
/* SPDX-FileCopyrightText: 2024 Blender Authors
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
|
|
/** \file
|
|
* \ingroup edinterface
|
|
*/
|
|
|
|
#include "BKE_context.hh"
|
|
|
|
#include "RNA_access.hh"
|
|
#include "RNA_prototypes.hh"
|
|
|
|
#include "WM_api.hh"
|
|
|
|
#include "UI_interface.hh"
|
|
#include "interface_intern.hh"
|
|
|
|
static void keymap_item_modified(bContext * /*C*/, void *kmi_p, void * /*unused*/)
|
|
{
|
|
wmKeyMapItem *kmi = (wmKeyMapItem *)kmi_p;
|
|
WM_keyconfig_update_tag(nullptr, kmi);
|
|
U.runtime.is_dirty = true;
|
|
}
|
|
|
|
static void template_keymap_item_properties(uiLayout *layout, const char *title, PointerRNA *ptr)
|
|
{
|
|
uiItemS(layout);
|
|
|
|
if (title) {
|
|
uiItemL(layout, title, ICON_NONE);
|
|
}
|
|
|
|
uiLayout *flow = uiLayoutColumnFlow(layout, 2, false);
|
|
|
|
RNA_STRUCT_BEGIN_SKIP_RNA_TYPE (ptr, prop) {
|
|
const bool is_set = RNA_property_is_set(ptr, prop);
|
|
uiBut *but;
|
|
|
|
/* recurse for nested properties */
|
|
if (RNA_property_type(prop) == PROP_POINTER) {
|
|
PointerRNA propptr = RNA_property_pointer_get(ptr, prop);
|
|
|
|
if (propptr.data && RNA_struct_is_a(propptr.type, &RNA_OperatorProperties)) {
|
|
const char *name = RNA_property_ui_name(prop);
|
|
template_keymap_item_properties(layout, name, &propptr);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
uiLayout *box = uiLayoutBox(flow);
|
|
uiLayoutSetActive(box, is_set);
|
|
uiLayout *row = uiLayoutRow(box, false);
|
|
|
|
/* property value */
|
|
uiItemFullR(row, ptr, prop, -1, 0, UI_ITEM_NONE, std::nullopt, ICON_NONE);
|
|
|
|
if (is_set) {
|
|
/* unset operator */
|
|
uiBlock *block = uiLayoutGetBlock(row);
|
|
UI_block_emboss_set(block, UI_EMBOSS_NONE);
|
|
but = uiDefIconButO(block,
|
|
UI_BTYPE_BUT,
|
|
"UI_OT_unset_property_button",
|
|
WM_OP_EXEC_DEFAULT,
|
|
ICON_X,
|
|
0,
|
|
0,
|
|
UI_UNIT_X,
|
|
UI_UNIT_Y,
|
|
nullptr);
|
|
but->rnapoin = *ptr;
|
|
but->rnaprop = prop;
|
|
UI_block_emboss_set(block, UI_EMBOSS);
|
|
}
|
|
}
|
|
RNA_STRUCT_END;
|
|
}
|
|
|
|
void uiTemplateKeymapItemProperties(uiLayout *layout, PointerRNA *ptr)
|
|
{
|
|
PointerRNA propptr = RNA_pointer_get(ptr, "properties");
|
|
|
|
if (propptr.data) {
|
|
uiBlock *block = uiLayoutGetBlock(layout);
|
|
int i = uiLayoutGetBlock(layout)->buttons.size() - 1;
|
|
|
|
WM_operator_properties_sanitize(&propptr, false);
|
|
template_keymap_item_properties(layout, nullptr, &propptr);
|
|
if (i < 0) {
|
|
return;
|
|
}
|
|
/* attach callbacks to compensate for missing properties update,
|
|
* we don't know which keymap (item) is being modified there */
|
|
for (; i < block->buttons.size(); i++) {
|
|
uiBut *but = block->buttons[i].get();
|
|
/* operator buttons may store props for use (file selector, #36492) */
|
|
if (but->rnaprop) {
|
|
UI_but_func_set(but, keymap_item_modified, ptr->data, nullptr);
|
|
|
|
/* Otherwise the keymap will be re-generated which we're trying to edit,
|
|
* see: #47685 */
|
|
UI_but_flag_enable(but, UI_BUT_UPDATE_DELAY);
|
|
}
|
|
}
|
|
}
|
|
}
|