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

Merge branch 'dudztroyer-hotfix-1.6.2' into hotfix-1.6.2

Browse Source
This commit is contained in:
Jinhao 2018-11-05 02:50:17 +08:00
commit 840d6b775d
4 changed files with 3445 additions and 3416 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,6 +167,8 @@ namespace nana{ namespace widgets
bool select(bool); bool select(bool);
bool select_points(nana::upoint arg_a, nana::upoint arg_b);
/// Sets the end position of a selected string. /// Sets the end position of a selected string.
void set_end_caret(bool stay_in_view); void set_end_caret(bool stay_in_view);

2
include/nana/gui/widgets/textbox.hpp
View File

@ -224,6 +224,8 @@ namespace nana
/// Selects/unselects all text. /// Selects/unselects all text.
void select(bool); void select(bool);
void select_points(nana::upoint arg_a, nana::upoint arg_b);
/// Returns the bounds of a text selection /// Returns the bounds of a text selection
/** /**
* @return no selection if pair.first == pair.second. * @return no selection if pair.first == pair.second.

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

File diff suppressed because it is too large Load Diff

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

@ -584,7 +584,16 @@ namespace drawerbase {
{ {
internal_scope_guard lock; internal_scope_guard lock;
auto editor = get_drawer_trigger().editor(); auto editor = get_drawer_trigger().editor();
if(editor && editor->select(yes)) if (editor && editor->select(yes))
API::refresh_window(*this);
}
void textbox::select_points(nana::upoint arg_a, nana::upoint arg_b)
{
auto editor = get_drawer_trigger().editor();
internal_scope_guard lock;
if (editor && editor->select_points(arg_a, arg_b))
API::refresh_window(*this); API::refresh_window(*this);
} }