Merge branch 'hotfix-1.4' into develop

This commit is contained in:
Jinhao
2016-09-24 09:58:44 +08:00
16 changed files with 349 additions and 145 deletions

View File

@@ -345,8 +345,8 @@ namespace drawerbase {
{
auto editor = get_drawer_trigger().editor();
internal_scope_guard lock;
if (editor)
editor->move_caret(pos);
if (editor && editor->move_caret(pos, true))
API::refresh_window(handle());
return *this;
}
@@ -628,6 +628,14 @@ namespace drawerbase {
editor->select_behavior(move_to_end);
}
void textbox::set_undo_queue_length(std::size_t len)
{
internal_scope_guard lock;
auto editor = get_drawer_trigger().editor();
if (editor)
editor->set_undo_queue_length(len);
}
//Override _m_caption for caption()
auto textbox::_m_caption() const throw() -> native_string_type
{