griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Make format

Browse Source 
Changes resulting in Make Format
This commit is contained in:
Harley Acheson
2023-10-12 10:35:19 -07:00
parent 2c7d15b19c
commit 9071ed6a7f
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/editors/interface/interface_handlers.cc
View File

@@ -10771,7 +10771,7 @@ static int ui_handle_menu_event(bContext *C,
case EVT_YKEY:
case EVT_ZKEY:
case EVT_SPACEKEY: {
if (ELEM(event->val, KM_PRESS, KM_DBL_CLICK) &&
if (ELEM(event->val, KM_PRESS, KM_DBL_CLICK) &&
((event->modifier & (KM_SHIFT | KM_CTRL | KM_OSKEY)) == 0) &&
/* Only respond to explicit press to avoid the event that opened the menu
* activating an item when the key is held. */
@@ -10781,8 +10781,7 @@ static int ui_handle_menu_event(bContext *C,
/* Menu search if spacebar or SearchOnKeyPress. */
MenuType *mt = WM_menutype_find(menu->menu_idname, false);
if ((mt && bool(mt->flag & MenuTypeFlag::SearchOnKeyPress)) ||
event->type == EVT_SPACEKEY)
{
event->type == EVT_SPACEKEY) {
if ((level != 0) && (but == nullptr || !menu->menu_idname[0])) {
/* Search parent if the child is open but not activated or not searchable. */
menu->menuretval = UI_RETURN_OUT | UI_RETURN_OUT_PARENT;
@@ -10794,8 +10793,7 @@ static int ui_handle_menu_event(bContext *C,
}
if (ui_menu_pass_event_to_parent_if_nonactive(
menu, but, level, is_parent_menu, retval))
{
menu, but, level, is_parent_menu, retval)) {
break;
}

2
source/blender/editors/interface/interface_region_menu_popup.cc
View File

@@ -623,7 +623,7 @@ static void ui_popup_menu_create_from_menutype(bContext *C,
handle->can_refresh = true;
if (bool(mt->flag & MenuTypeFlag::SearchOnKeyPress)) {
ED_workspace_status_text(C, TIP_("Type to search..."));
ED_workspace_status_text(C, TIP_("Type to search..."));
}
else if (mt->idname[0]) {
ED_workspace_status_text(C, TIP_("Press spacebar to search..."));