[Bf-blender-cvs] [1f3be45f1fb] blender-v3.4-release: Fix T102242: Underline shortcut keys not working/appearing in sub-menu
Julian Eisel
noreply at git.blender.org
Tue Nov 8 11:34:25 CET 2022
Commit: 1f3be45f1fbf2051436ce640363b0a4277e2fd62
Author: Julian Eisel
Date: Tue Nov 8 11:32:37 2022 +0100
Branches: blender-v3.4-release
https://developer.blender.org/rB1f3be45f1fbf2051436ce640363b0a4277e2fd62
Fix T102242: Underline shortcut keys not working/appearing in sub-menu
Upon closer inspection, looks like `UI_BLOCK_NUMSELECT` was previously
set for all code paths and 99e5024e97f1 removed it from one.
===================================================================
M source/blender/editors/interface/interface_region_menu_popup.cc
===================================================================
diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc
index 871fd5c6166..8fd6731d2ec 100644
--- a/source/blender/editors/interface/interface_region_menu_popup.cc
+++ b/source/blender/editors/interface/interface_region_menu_popup.cc
@@ -286,13 +286,13 @@ static uiBlock *ui_block_func_POPUP(bContext *C, uiPopupBlockHandle *handle, voi
int width, height;
UI_block_layout_resolve(block, &width, &height);
- UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT);
+ UI_block_flag_enable(block, UI_BLOCK_MOVEMOUSE_QUIT | UI_BLOCK_NUMSELECT);
if (pup->popup) {
int offset[2] = {0, 0};
uiBut *but_activate = nullptr;
- UI_block_flag_enable(block, UI_BLOCK_LOOP | UI_BLOCK_NUMSELECT);
+ UI_block_flag_enable(block, UI_BLOCK_LOOP);
UI_block_theme_style_set(block, UI_BLOCK_THEME_STYLE_POPUP);
UI_block_direction_set(block, direction);
More information about the Bf-blender-cvs
mailing list