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

merge beru's changes

Browse Source
This commit is contained in:
Jinhao
2015-08-02 03:33:43 +08:00
parent 66c1e1ad98
commit e0ee42d184
18 changed files with 59 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ namespace nana{ namespace widgets
virtual bool merge(const undoable_command_interface<EnumCommand>& rhs) override
{
//Implement later
return false;
}
protected:
@@ -1620,7 +1619,7 @@ namespace nana{ namespace widgets
text_area_.captured = true;
//Set caret pos by screen point and get the caret pos.
auto pos = mouse_caret(scrpos);
mouse_caret(scrpos);
if(!select(false))
{
select_.a = points_.caret; //Set begin caret
@@ -2315,7 +2314,7 @@ namespace nana{ namespace widgets
}
break;
case keyboard::os_pageup:
if (caret.y >= (int)screen_lines() && points_.offset.y >= (int)screen_lines()) {
if (caret.y >= screen_lines() && points_.offset.y >= static_cast<int>(screen_lines())) {
points_.offset.y -= screen_lines();
caret.y -= screen_lines();
changed = true;
@@ -2967,7 +2966,7 @@ namespace nana{ namespace widgets
if (if_mask && mask_char_)
mask_str.reset(new nana::string(str.size(), mask_char_));
bool focused = API::is_focus_ready(window_); // do this many times is not efficient...
bool focused = API::is_focus_ready(window_);
auto & linestr = (if_mask && mask_char_ ? *mask_str : str);