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

fix no response of Delete key

Browse Source
This commit is contained in:
Jinhao 2015-03-25 01:44:56 +08:00
parent 58b206cb93
commit 9a5dfe7f88
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/gui/widgets/skeletons/text_editor.hpp
View File

@ -157,7 +157,8 @@ namespace nana{ namespace widgets
void set_accept(std::function<bool(char_type)>); void set_accept(std::function<bool(char_type)>);
void set_accept(accepts); void set_accept(accepts);
bool respone_keyboard(char_type); bool respone_char(char_type);
bool respone_key(char_type);
void typeface_changed(); void typeface_changed();
@ -227,7 +228,6 @@ namespace nana{ namespace widgets
void del(); void del();
void backspace(bool record_undo = true); void backspace(bool record_undo = true);
void undo(bool reverse); void undo(bool reverse);
bool move(nana::char_t);
void move_ns(bool to_north); //Moves up and down void move_ns(bool to_north); //Moves up and down
void move_left(); void move_left();
void move_right(); void move_right();

12
source/gui/widgets/combox.cpp
View File

@ -677,6 +677,7 @@ namespace nana
if(!drawer_->widget_ptr()->enabled()) if(!drawer_->widget_ptr()->enabled())
return; return;
bool call_other_keys = false;
if(drawer_->editable()) if(drawer_->editable())
{ {
bool is_move_up = false; bool is_move_up = false;
@ -684,7 +685,7 @@ namespace nana
{ {
case keyboard::os_arrow_left: case keyboard::os_arrow_left:
case keyboard::os_arrow_right: case keyboard::os_arrow_right:
drawer_->editor()->move(arg.key); drawer_->editor()->respone_key(arg.key);
drawer_->editor()->reset_caret(); drawer_->editor()->reset_caret();
break; break;
case keyboard::os_arrow_up: case keyboard::os_arrow_up:
@ -692,6 +693,8 @@ namespace nana
case keyboard::os_arrow_down: case keyboard::os_arrow_down:
drawer_->move_items(is_move_up, true); drawer_->move_items(is_move_up, true);
break; break;
default:
call_other_keys = true;
} }
} }
else else
@ -706,14 +709,19 @@ namespace nana
case keyboard::os_arrow_down: case keyboard::os_arrow_down:
drawer_->move_items(is_move_up, true); drawer_->move_items(is_move_up, true);
break; break;
default:
call_other_keys = true;
} }
} }
if (call_other_keys)
drawer_->editor()->respone_key(arg.key);
API::lazy_refresh(); API::lazy_refresh();
} }
void trigger::key_char(graph_reference graph, const arg_keyboard& arg) void trigger::key_char(graph_reference graph, const arg_keyboard& arg)
{ {
if (drawer_->editor()->respone_keyboard(arg.key)) if (drawer_->editor()->respone_char(arg.key))
API::lazy_refresh(); API::lazy_refresh();
} }
//end class trigger //end class trigger

4
source/gui/widgets/spinbox.cpp
View File

@ -559,7 +559,7 @@ namespace nana
void drawer::key_press(graph_reference, const arg_keyboard& arg) void drawer::key_press(graph_reference, const arg_keyboard& arg)
{ {
if (impl_->editor()->move(arg.key)) if (impl_->editor()->respone_key(arg.key))
{ {
impl_->editor()->reset_caret(); impl_->editor()->reset_caret();
impl_->draw_spins(); impl_->draw_spins();
@ -569,7 +569,7 @@ namespace nana
void drawer::key_char(graph_reference, const arg_keyboard& arg) void drawer::key_char(graph_reference, const arg_keyboard& arg)
{ {
if (impl_->editor()->respone_keyboard(arg.key)) if (impl_->editor()->respone_char(arg.key))
{ {
if (!impl_->value(impl_->editor()->text())) if (!impl_->value(impl_->editor()->text()))
impl_->draw_spins(); impl_->draw_spins();

4
source/gui/widgets/textbox.cpp
View File

@ -136,7 +136,7 @@ namespace drawerbase {
void drawer::key_press(graph_reference, const arg_keyboard& arg) void drawer::key_press(graph_reference, const arg_keyboard& arg)
{ {
if(editor_->move(arg.key)) if(editor_->respone_key(arg.key))
{ {
editor_->reset_caret(); editor_->reset_caret();
API::lazy_refresh(); API::lazy_refresh();
@ -145,7 +145,7 @@ namespace drawerbase {
void drawer::key_char(graph_reference, const arg_keyboard& arg) void drawer::key_char(graph_reference, const arg_keyboard& arg)
{ {
if (editor_->respone_keyboard(arg.key)) if (editor_->respone_char(arg.key))
API::lazy_refresh(); API::lazy_refresh();
} }