blender
/
blender
136
407
Fork 589
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

UI: Improved Operator Confirmations #104670

Merged
Harley Acheson merged 23 commits from Harley/blender:ConfirmDialogs into main 2024-01-04 18:42:34 +01:00
Conversation 4 Commits 23 Files Changed 2 +36 -11
2 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5dc7cc686d - Show all commits

3
source/blender/windowmanager/WM_types.h
View File

@ -930,6 +930,9 @@ typedef enum wmWarningPosition {
typedef struct wmWarningDetails { typedef struct wmWarningDetails {
char title[1024]; char title[1024];
char message[1024]; char message[1024];
char message2[1024];
char link_target[1024];
char link_text[1024];
char confirm_button[256]; char confirm_button[256];
char cancel_button[256]; char cancel_button[256];
int icon; int icon;

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

@ -1177,8 +1177,8 @@ int WM_enum_search_invoke(bContext *C, wmOperator *op, const wmEvent * /*event*/
static void wm_operator_block_cancel(bContext *C, void *arg_op, void *arg_block) static void wm_operator_block_cancel(bContext *C, void *arg_op, void *arg_block)
{ {
wmOperator *op = arg_op; wmOperator *op = static_cast<wmOperator *>(arg_op);
uiBlock *block = arg_block; uiBlock *block = static_cast<uiBlock *>(arg_block);
UI_popup_block_close(C, CTX_wm_window(C), block); UI_popup_block_close(C, CTX_wm_window(C), block);
WM_redraw_windows(C); WM_redraw_windows(C);
if (op) { if (op) {
@ -1191,8 +1191,8 @@ static void wm_operator_block_cancel(bContext *C, void *arg_op, void *arg_block)
static void wm_operator_block_confirm(bContext *C, void *arg_op, void *arg_block) static void wm_operator_block_confirm(bContext *C, void *arg_op, void *arg_block)
{ {
wmOperator *op = arg_op; wmOperator *op = static_cast<wmOperator *>(arg_op);
uiBlock *block = arg_block; uiBlock *block = static_cast<uiBlock *>(arg_block);
UI_popup_block_close(C, CTX_wm_window(C), block); UI_popup_block_close(C, CTX_wm_window(C), block);
WM_redraw_windows(C); WM_redraw_windows(C);
if (op) { if (op) {
@ -1202,7 +1202,7 @@ static void wm_operator_block_confirm(bContext *C, void *arg_op, void *arg_block
static uiBlock *wm_block_confirm_create(bContext *C, ARegion *region, void *arg_op) static uiBlock *wm_block_confirm_create(bContext *C, ARegion *region, void *arg_op)
{ {
wmOperator *op = arg_op; wmOperator *op = static_cast<wmOperator *>(arg_op);
wmWarningDetails warning = {0}; wmWarningDetails warning = {0};
@ -1239,10 +1239,24 @@ static uiBlock *wm_block_confirm_create(bContext *C, ARegion *region, void *arg_
UI_block_flag_enable(block, block_flags); UI_block_flag_enable(block, block_flags);
const uiStyle *style = UI_style_get_dpi(); const uiStyle *style = UI_style_get_dpi();
int text_width = MAX3( int text_width = MAX2(
120 * UI_SCALE_FAC, 120 * UI_SCALE_FAC,
BLF_width(style->widget.uifont_id, warning.title, ARRAY_SIZE(warning.title)), BLF_width(style->widget.uifont_id, warning.title, ARRAY_SIZE(warning.title)));
BLF_width(style->widget.uifont_id, warning.message, ARRAY_SIZE(warning.message))); if (warning.message[0]) {
text_width = MAX2(
text_width,
BLF_width(style->widget.uifont_id, warning.message, ARRAY_SIZE(warning.message)));
}
if (warning.message2[0]) {
text_width = MAX2(
text_width,
BLF_width(style->widget.uifont_id, warning.message2, ARRAY_SIZE(warning.message2)));
}
if (warning.link_text[0]) {
text_width = MAX2(
text_width,
BLF_width(style->widget.uifont_id, warning.link_text, ARRAY_SIZE(warning.link_text)));
}
const bool small = warning.size == WM_WARNING_SIZE_SMALL; const bool small = warning.size == WM_WARNING_SIZE_SMALL;
const int padding = (small ? 7 : 14) * UI_SCALE_FAC; const int padding = (small ? 7 : 14) * UI_SCALE_FAC;
@ -1274,6 +1288,13 @@ static uiBlock *wm_block_confirm_create(bContext *C, ARegion *region, void *arg_
if (warning.message[0]) { if (warning.message[0]) {
uiItemL(layout, warning.message, ICON_NONE); uiItemL(layout, warning.message, ICON_NONE);
} }
if (warning.message2[0]) {
uiItemL(layout, warning.message2, ICON_NONE);
}
if (warning.link_target[0] && warning.link_text[0]) {
uiItemL(layout, warning.link_text, ICON_NONE);
}
uiItemS_ex(layout, small ? 0.5f : 4.0f); uiItemS_ex(layout, small ? 0.5f : 4.0f);
@ -1326,9 +1347,10 @@ static uiBlock *wm_block_confirm_create(bContext *C, ARegion *region, void *arg_
} }
if (warning.position == WM_WARNING_POSITION_MOUSE) { if (warning.position == WM_WARNING_POSITION_MOUSE) {
int x = uiLayoutGetWidth(layout) * (windows_layout ? -0.33f : -0.66f); int bounds_offset[2];
int y = UI_UNIT_Y * (warning.message[0] ? 3.1 : 2.5); bounds_offset[0] = uiLayoutGetWidth(layout) * (windows_layout ? -0.33f : -0.66f);
UI_block_bounds_set_popup(block, padding, (const int[2]){x, y}); bounds_offset[1] = UI_UNIT_Y * (warning.message[0] ? 3.1 : 2.5);
UI_block_bounds_set_popup(block, padding, bounds_offset);
} }
else if (warning.position == WM_WARNING_POSITION_CENTER) { else if (warning.position == WM_WARNING_POSITION_CENTER) {
UI_block_bounds_set_centered(block, padding); UI_block_bounds_set_centered(block, padding);