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

fix bug that DEL key is incorrect in key_press/key_release(#259)

Browse Source
This commit is contained in:
cnjinhao
2017-09-22 15:47:12 +08:00
parent f14fc9bf6d
commit bb47cdc6c9
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/nana/gui/basis.hpp
View File

@@ -91,6 +91,8 @@ namespace nana
substitute = 0x1A, //Ctrl+Z substitute = 0x1A, //Ctrl+Z
escape = 0x1B, escape = 0x1B,
space = 0x20, //Space space = 0x20, //Space
del = 0x7F, //Delete
os_del = del, //Deprecated
//The following names are intuitive name of ASCII control codes //The following names are intuitive name of ASCII control codes
select_all = start_of_headline, select_all = start_of_headline,
@@ -106,8 +108,8 @@ namespace nana
os_ctrl = 0x11, os_ctrl = 0x11,
os_pageup = 0x21, os_pagedown, os_pageup = 0x21, os_pagedown,
os_arrow_left = 0x25, os_arrow_up, os_arrow_right, os_arrow_down, os_arrow_left = 0x25, os_arrow_up, os_arrow_right, os_arrow_down,
os_insert = 0x2D, os_del , os_insert = 0x2D,
os_end = 0x23 , os_home //Pos 1 os_end = 0x23, os_home //Pos 1
}; };
}; };

4
source/gui/detail/bedrock_posix.cpp
View File

@@ -438,8 +438,8 @@ namespace detail
keysym = keyboard::os_arrow_left + (keysym - XK_Left); break; keysym = keyboard::os_arrow_left + (keysym - XK_Left); break;
case XK_Insert: case XK_Insert:
keysym = keyboard::os_insert; break; keysym = keyboard::os_insert; break;
case XK_Delete: case XK_Delete: case XK_KP_Delete:
keysym = keyboard::os_del; break; keysym = keyboard::del; break;
case XK_Shift_L: case XK_Shift_R: //shift case XK_Shift_L: case XK_Shift_R: //shift
keysym = keyboard::os_shift; break; keysym = keyboard::os_shift; break;
case XK_Control_L: case XK_Control_R: //ctrl case XK_Control_L: case XK_Control_R: //ctrl

17
source/gui/detail/bedrock_windows.cpp
View File

@@ -775,6 +775,19 @@ namespace detail
if (thrd) thrd->event_window = prev_event_wd; if (thrd) thrd->event_window = prev_event_wd;
} }
//Translate OS Virtual-Key into ASCII code
wchar_t translate_virtual_key(WPARAM vkey)
{
switch (vkey)
{
case VK_DELETE:
return 127;
case VK_DECIMAL:
return 46;
}
return static_cast<wchar_t>(vkey);
}
LRESULT CALLBACK Bedrock_WIN32_WindowProc(HWND root_window, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK Bedrock_WIN32_WindowProc(HWND root_window, UINT message, WPARAM wParam, LPARAM lParam)
{ {
LRESULT window_proc_value = 0; LRESULT window_proc_value = 0;
@@ -1436,7 +1449,7 @@ namespace detail
arg.evt_code = event_code::key_press; arg.evt_code = event_code::key_press;
arg.window_handle = reinterpret_cast<window>(msgwnd); arg.window_handle = reinterpret_cast<window>(msgwnd);
arg.ignore = false; arg.ignore = false;
arg.key = static_cast<wchar_t>(wParam); arg.key = translate_virtual_key(wParam);
brock.get_key_state(arg); brock.get_key_state(arg);
brock.emit(event_code::key_press, msgwnd, arg, true, &context); brock.emit(event_code::key_press, msgwnd, arg, true, &context);
@@ -1522,7 +1535,7 @@ namespace detail
arg_keyboard arg; arg_keyboard arg;
arg.evt_code = event_code::key_release; arg.evt_code = event_code::key_release;
arg.window_handle = reinterpret_cast<window>(msgwnd); arg.window_handle = reinterpret_cast<window>(msgwnd);
arg.key = static_cast<wchar_t>(wParam); arg.key = translate_virtual_key(wParam);
brock.get_key_state(arg); brock.get_key_state(arg);
arg.ignore = false; arg.ignore = false;
brock.emit(event_code::key_release, msgwnd, arg, true, &context); brock.emit(event_code::key_release, msgwnd, arg, true, &context);

2
source/gui/widgets/skeletons/text_editor.cpp
View File

@@ -1233,7 +1233,7 @@ namespace nana{ namespace widgets
case keyboard::os_pagedown: case keyboard::os_pagedown:
_m_handle_move_key(arg); _m_handle_move_key(arg);
break; break;
case keyboard::os_del: case keyboard::del:
// send delete to set_accept function // send delete to set_accept function
if (this->attr().editable && (!impl_->capacities.pred_acceptive || impl_->capacities.pred_acceptive(key))) if (this->attr().editable && (!impl_->capacities.pred_acceptive || impl_->capacities.pred_acceptive(key)))
del(); del();