blender
/
blender
136
408
Fork 591
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

WIP: UI: Operator Props Dialog Changes #117465

Closed
Harley Acheson wants to merge 3 commits from Harley/blender:OpPropsDialog into main
pull from: Harley/blender:OpPropsDialog
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 3 Files Changed 2 +50 -7
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/interface/interface_templates.cc
View File

@ -2725,7 +2725,8 @@ static eAutoPropButsReturn template_operator_property_buts_draw_single(
UI_block_lock_clear(block);
if (layout_flags & UI_TEMPLATE_OP_PROPS_SHOW_TITLE) {
uiItemL(layout, WM_operatortype_name(op->type, op->ptr).c_str(), ICON_NONE);
uiItemL_ex(layout, WM_operatortype_name(op->type, op->ptr).c_str(), ICON_NONE, true, false);
uiItemS_ex(layout, 0.3f);
}
/* menu */

54
source/blender/windowmanager/intern/wm_operators.cc
View File

@ -1682,6 +1682,18 @@ static void dialog_exec_cb(bContext *C, void *arg1, void *arg2)
WM_operator_call_ex(C, op, true);
}
/* Only invoked by Cancel button in popups created with wm_block_dialog_create() */
static void dialog_cancel_cb(bContext *C, void *arg1, void *arg2)
{
wmOpPopUp *data = static_cast<wmOpPopUp *>(arg1);
WM_operator_free(data->op);
MEM_freeN(data);
uiBlock *block = static_cast<uiBlock *>(arg2);
UI_popup_menu_retval_set(block, UI_RETURN_CANCEL, true);
UI_popup_block_close(C, CTX_wm_window(C), block);
}
/* Dialogs are popups that require user verification (click OK) before exec */
static uiBlock *wm_block_dialog_create(bContext *C, ARegion *region, void *user_data)
{
@ -1691,7 +1703,7 @@ static uiBlock *wm_block_dialog_create(bContext *C, ARegion *region, void *user_
uiBlock *block = UI_block_begin(C, region, __func__, UI_EMBOSS);
UI_block_flag_disable(block, UI_BLOCK_LOOP);
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_REGULAR);
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
/* Intentionally don't use #UI_BLOCK_MOVEMOUSE_QUIT, some dialogs have many items
* where quitting by accident is very annoying. */
@ -1706,20 +1718,50 @@ static uiBlock *wm_block_dialog_create(bContext *C, ARegion *region, void *user_
/* clear so the OK button is left alone */
UI_block_func_set(block, nullptr, nullptr, nullptr);
#ifdef _WIN32
const bool windows_layout = true;
#else
const bool windows_layout = false;
#endif
/* new column so as not to interfere with custom layouts #26436. */
{
uiLayout *col = uiLayoutColumn(layout, false);
uiItemS_ex(col, 0.5f);
uiBlock *col_block = uiLayoutGetBlock(col);
/* Create OK button, the callback of which will execute op */
uiBut *but = uiDefBut(
col_block, UI_BTYPE_BUT, 0, IFACE_("OK"), 0, -30, 0, UI_UNIT_Y, nullptr, 0, 0, 0, 0, "");
UI_but_flag_enable(but, UI_BUT_ACTIVE_DEFAULT);
UI_but_func_set(but, dialog_exec_cb, data, col_block);
uiLayout *split = uiLayoutSplit(col, 0.0f, true);
uiLayoutSetScaleY(split, 1.2f);
uiBut *confirm;
uiBut *cancel;
if (windows_layout) {
confirm = uiDefBut(
col_block, UI_BTYPE_BUT, 0, IFACE_("OK"), 0, 0, 0, UI_UNIT_Y, nullptr, 0, 0, 0, 0, "");
uiLayoutColumn(split, false);
}
cancel = uiDefBut(
col_block, UI_BTYPE_BUT, 0, IFACE_("Cancel"), 0, 0, 0, UI_UNIT_Y, nullptr, 0, 0, 0, 0, "");
if (!windows_layout) {
uiLayoutColumn(split, false);
confirm = uiDefBut(
col_block, UI_BTYPE_BUT, 0, IFACE_("OK"), 0, 0, 0, UI_UNIT_Y, nullptr, 0, 0, 0, 0, "");
}
UI_but_flag_enable(confirm, UI_BUT_ACTIVE_DEFAULT);
UI_but_func_set(confirm, dialog_exec_cb, data, col_block);
UI_but_func_set(cancel, dialog_cancel_cb, data, col_block);
}
/* center around the mouse */
UI_block_bounds_set_popup(
block, 6 * UI_SCALE_FAC, blender::int2{data->width / -2, data->height / 2});
block, 10 * UI_SCALE_FAC, blender::int2{data->width / -2, data->height / 2});
return block;
}