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

Merge remote-tracking branch 'cnjinhao/hotfix-1.3' into geometric_scheme

Browse Source
This commit is contained in:
qPCR4vir
2016-04-17 11:14:28 +02:00
parent b04c290ae7 67431865c9
commit 99b798597b
3 changed files with 61 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@ namespace nana{ namespace widgets
void set_end_caret();
bool hit_text_area(const point&) const;
bool hit_select_area(nana::upoint pos) const;
bool hit_select_area(nana::upoint pos, bool ignore_when_select_all) const;
bool move_select();
bool mask(wchar_t);
@@ -355,10 +355,9 @@ namespace nana{ namespace widgets
struct selection
{
enum mode_selection_t{mode_no_selected, mode_mouse_selected, mode_method_selected};
enum mode_selection_t{mode_no_selected, mode_mouse_selected, mode_method_selected, mode_move_selected};
mode_selection_t mode_selection;
bool dragged;
nana::upoint a, b;
}select_;