From 47139c69d7e46975c273a8f6981aca9e5cdda1d1 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 20 Nov 2018 10:06:02 +1100 Subject: Keymap: only use delete confirmation for X-key Only use confirmation w/ X-key since this is more likely to be pressed by accident. Delete-key delete doesn't confirm. Part of D3953 by @Zachman w/ edits --- source/blender/windowmanager/WM_api.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source/blender/windowmanager/WM_api.h') diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h index 7628217d88f..8e12ac96ea3 100644 --- a/source/blender/windowmanager/WM_api.h +++ b/source/blender/windowmanager/WM_api.h @@ -287,7 +287,8 @@ void WM_menu_name_call(struct bContext *C, const char *menu_name, short context int WM_enum_search_invoke_previews(struct bContext *C, struct wmOperator *op, short prv_cols, short prv_rows); int WM_enum_search_invoke(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); /* invoke callback, confirm menu + exec */ -int WM_operator_confirm (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +int WM_operator_confirm(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); +int WM_operator_confirm_or_exec(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); /* invoke callback, file selector "filepath" unset + exec */ int WM_operator_filesel (struct bContext *C, struct wmOperator *op, const struct wmEvent *event); bool WM_operator_filesel_ensure_ext_imtype(wmOperator *op, const struct ImageFormatData *im_format); @@ -348,6 +349,7 @@ bool WM_operator_last_properties_store(struct wmOperator *op); /* wm_operator_props.c */ +void WM_operator_properties_confirm_or_exec(struct wmOperatorType *ot); void WM_operator_properties_filesel( struct wmOperatorType *ot, int filter, short type, short action, short flag, short display, short sort); -- cgit v1.2.3