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

Merge branch 'besh81-master' into hotfix-1.3

Browse Source
This commit is contained in:
Jinhao 2016-06-10 16:36:13 +08:00
commit a591735a2a
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/gui/widgets/combox.cpp
View File

@ -171,7 +171,7 @@ namespace nana
if(editor_) if(editor_)
{ {
editor_->editable(enb); editor_->editable(enb);
editor_->show_caret(enb);
if (!enb) if (!enb)
{ {
editor_->ext_renderer().background = [this](graph_reference graph, const ::nana::rectangle&, const ::nana::color&) editor_->ext_renderer().background = [this](graph_reference graph, const ::nana::rectangle&, const ::nana::color&)
@ -245,7 +245,8 @@ namespace nana
void open_lister_if_push_button_positioned() void open_lister_if_push_button_positioned()
{ {
if((nullptr == state_.lister) && !items_.empty() && (parts::push_button == state_.pointer_where)) if(nullptr == state_.lister && !items_.empty())
if((parts::push_button == state_.pointer_where && editor_->attr().editable) || !editor_->attr().editable)
{ {
module_.items.clear(); module_.items.clear();
std::copy(items_.cbegin(), items_.cend(), std::back_inserter(module_.items)); std::copy(items_.cbegin(), items_.cend(), std::back_inserter(module_.items));
@ -622,7 +623,7 @@ namespace nana
if(drawer_->widget_ptr()->enabled()) if(drawer_->widget_ptr()->enabled())
{ {
auto * editor = drawer_->editor(); auto * editor = drawer_->editor();
if (!editor->mouse_pressed(arg)) editor->mouse_pressed(arg);
drawer_->open_lister_if_push_button_positioned(); drawer_->open_lister_if_push_button_positioned();
drawer_->draw(); drawer_->draw();

1
source/gui/widgets/listbox.cpp
View File

@ -4360,7 +4360,6 @@ namespace nana
//Implementation of arg_category //Implementation of arg_category
//Contributed by leobackes(pr#97) //Contributed by leobackes(pr#97)
arg_category::arg_category ( const nana::drawerbase::listbox::cat_proxy& cat ) noexcept arg_category::arg_category ( const nana::drawerbase::listbox::cat_proxy& cat ) noexcept
: category(cat), block_change_(false) : category(cat), block_change_(false)
{ {

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

@ -1635,11 +1635,14 @@ namespace nana{ namespace widgets
bool text_editor::mouse_move(bool left_button, const point& scrpos) bool text_editor::mouse_move(bool left_button, const point& scrpos)
{ {
cursor cur = cursor::iterm; cursor cur = cursor::iterm;
if ((!hit_text_area(scrpos)) && (!text_area_.captured)) if(((!hit_text_area(scrpos)) && (!text_area_.captured)) || !attributes_.editable || !API::window_enabled(window_))
cur = cursor::arrow; cur = cursor::arrow;
API::window_cursor(window_, cur); API::window_cursor(window_, cur);
if(!attributes_.editable)
return false;
if(left_button) if(left_button)
{ {
mouse_caret(scrpos); mouse_caret(scrpos);
@ -1655,6 +1658,9 @@ namespace nana{ namespace widgets
bool text_editor::mouse_pressed(const arg_mouse& arg) bool text_editor::mouse_pressed(const arg_mouse& arg)
{ {
if(!attributes_.editable)
return false;
if (event_code::mouse_down == arg.evt_code) if (event_code::mouse_down == arg.evt_code)
{ {
if (!hit_text_area(arg.pos)) if (!hit_text_area(arg.pos))
@ -1790,6 +1796,9 @@ namespace nana{ namespace widgets
reset_caret_pixels(); reset_caret_pixels();
} }
if(!attributes_.editable)
visible = false;
API::caret_visible(window_, visible); API::caret_visible(window_, visible);
if(visible) if(visible)
@ -3078,7 +3087,7 @@ namespace nana{ namespace widgets
graph_.palette(false, scheme_->selection.get_color()); graph_.palette(false, scheme_->selection.get_color());
//The text is not selected or the whole line text is selected //The text is not selected or the whole line text is selected
if (!focused || (!_m_get_sort_select_points(a, b)) || (select_.a.y != str_pos.y && select_.b.y != str_pos.y)) if(!focused || (!_m_get_sort_select_points(a, b)) || (select_.a.y != str_pos.y && select_.b.y != str_pos.y) || !attributes_.editable)
{ {
bool selected = (a.y < str_pos.y && str_pos.y < b.y); bool selected = (a.y < str_pos.y && str_pos.y < b.y);
for (auto & ent : reordered) for (auto & ent : reordered)