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>2021-01-28 06:59:20 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-01-28 06:59:20 +0300
commit057859620d34b05bfe590620b9e770eccd36177a (patch)
tree536cd2f2bc67cb976837d2d050cdbf1c40e52276
parentdf135b74fc938ec5ff08bc912ece18917165319d (diff)
parent198980693ba7b183f7d2a32a21b65338edfdeb10 (diff)
Merge branch 'blender-v2.92-release'
-rw-r--r--source/blender/editors/interface/interface_handlers.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index f9634b8f731..1d2393ece8d 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9914,6 +9914,12 @@ static int ui_handle_menu_event(bContext *C,
break;
}
+ /* Only respond to explicit press to avoid the event that opened the menu
+ * activating an item when the key is held. */
+ if (event->is_repeat) {
+ break;
+ }
+
if (event->alt) {
act += 10;
}
@@ -9993,8 +9999,11 @@ static int ui_handle_menu_event(bContext *C,
case EVT_XKEY:
case EVT_YKEY:
case EVT_ZKEY: {
- if ((event->val == KM_PRESS || event->val == KM_DBL_CLICK) &&
- !IS_EVENT_MOD(event, shift, ctrl, oskey)) {
+ if (ELEM(event->val, KM_PRESS, KM_DBL_CLICK) &&
+ !IS_EVENT_MOD(event, shift, ctrl, oskey) &&
+ /* Only respond to explicit press to avoid the event that opened the menu
+ * activating an item when the key is held. */
+ !event->is_repeat) {
if (ui_menu_pass_event_to_parent_if_nonactive(menu, but, level, retval)) {
break;
}