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

fix issue when textbox::reset with no parameter

Browse Source
This commit is contained in:
Jinhao
2016-10-01 10:07:13 +08:00
parent 8b652ee308
commit 4b58704161
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1797,7 +1797,7 @@ namespace nana{ namespace widgets
if (select_all)
{
select(true);
move_caret_end();
move_caret_end(false);
renderred = true;
//If the text widget is focused by clicking mouse button, the selected text will be cancelled
@@ -1991,8 +1991,6 @@ namespace nana{ namespace widgets
return str;
}
//move_caret
//Set caret position through text coordinate
bool text_editor::move_caret(const upoint& crtpos, bool reset_caret)
{
const unsigned line_pixels = line_height();
@@ -2036,11 +2034,14 @@ namespace nana{ namespace widgets
return false;
}
void text_editor::move_caret_end()
void text_editor::move_caret_end(bool update)
{
points_.caret.y = static_cast<unsigned>(impl_->textbase.lines());
if(points_.caret.y) --points_.caret.y;
points_.caret.x = static_cast<unsigned>(impl_->textbase.getline(points_.caret.y).size());
if (update)
this->move_caret(points_.caret, false);
}
void text_editor::reset_caret_pixels() const

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

@@ -260,8 +260,11 @@ namespace drawerbase {
internal_scope_guard lock;
auto editor = get_drawer_trigger().editor();
if (editor)
{
editor->text(to_wstring(str), end_caret);
{
editor->text(to_wstring(str), false);
if (end_caret)
editor->move_caret_end(true);
editor->textbase().reset();
API::update_window(this->handle());
@@ -358,7 +361,7 @@ namespace drawerbase {
if(editor)
{
if(at_caret == false)
editor->move_caret_end();
editor->move_caret_end(false);
editor->put(to_wstring(text));
API::update_window(this->handle());