mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'hotfixes-1.0' into develop

Browse Source
This commit is contained in:
Jinhao
2015-03-01 22:16:17 +08:00
parent 22a75669c3 d3d46705f3
commit 57bd96a6ca
5 changed files with 165 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/detail/win32/bedrock.cpp
View File

@@ -1320,6 +1320,7 @@ namespace detail
arg.ignore = false;
brock.emit(event_code::shortkey, msgwnd, arg, true, &context);
}
def_window_proc = true;
break;
case WM_SYSKEYDOWN:
if(brock.whether_keyboard_shortkey() == false)
@@ -1340,6 +1341,7 @@ namespace detail
else if(brock.get_menu())
brock.remove_menu();
}
def_window_proc = true;
break;
case WM_SYSKEYUP:
if(brock.set_keyboard_shortkey(false) == false)
@@ -1356,6 +1358,7 @@ namespace detail
brock.emit(event_code::key_release, msgwnd, arg, true, &context);
}
}
def_window_proc = true;
break;
case WM_KEYDOWN:
if(msgwnd->flags.enabled)