Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-05-20 23:34:18 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-20 23:39:14 +0300
commite7895bac07f32d4f66184aff2ed2c08956daaac7 (patch)
treec817ebf7e0415253393b12aad58e5719c4e8ffba /source/blender/makesrna/intern/rna_wm_api.c
parent46514cf865238c6bbed70971da5ab8e1a8ef9fc2 (diff)
UI: support for custom keymaps for popovers
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_wm_api.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index a08a1846c5b..dc9c0223f6b 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -361,9 +361,9 @@ static PointerRNA rna_PopoverBegin(bContext *C)
return r_ptr;
}
-static void rna_PopoverEnd(bContext *C, PointerRNA *handle)
+static void rna_PopoverEnd(bContext *C, PointerRNA *handle, wmKeyMap *keymap)
{
- UI_popover_end(C, handle->data);
+ UI_popover_end(C, handle->data, keymap);
}
/* pie menu wrapper */
@@ -585,6 +585,7 @@ void RNA_api_wm(StructRNA *srna)
RNA_def_function_flag(func, FUNC_NO_SELF | FUNC_USE_CONTEXT);
parm = RNA_def_pointer(func, "menu", "UIPopover", "", "");
RNA_def_parameter_flags(parm, PROP_NEVER_NULL, PARM_RNAPTR);
+ RNA_def_pointer(func, "keymap", "KeyMap", "Key Map", "Active key map");
/* wrap uiPieMenuBegin */