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

filter out the middle and right button for item selection(#413)

Browse Source
This commit is contained in:
Jinhao 2019-04-10 00:41:04 +08:00
parent a4c3784efe
commit d931ebb61c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
/* /*
* A Combox Implementation * A Combox Implementation
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -676,7 +676,10 @@ namespace nana
{ {
auto * editor = drawer_->editor(); auto * editor = drawer_->editor();
editor->mouse_pressed(arg); editor->mouse_pressed(arg);
drawer_->open_lister_if_push_button_positioned();
//Pops up the droplist only if left button is clicked
if(arg.is_left_button())
drawer_->open_lister_if_push_button_positioned();
drawer_->draw(); drawer_->draw();
if(editor->attr().editable) if(editor->attr().editable)

9
source/gui/widgets/tabbar.cpp
View File

@ -1,6 +1,6 @@
/* /*
* A Tabbar Implementation * A Tabbar Implementation
* Copyright(C) 2003-2018 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2019 Jinhao(cnjinhao@hotmail.com)
* *
* Distributed under the Boost Software License, Version 1.0. * Distributed under the Boost Software License, Version 1.0.
* (See accompanying file LICENSE_1_0.txt or copy at * (See accompanying file LICENSE_1_0.txt or copy at
@ -1291,7 +1291,8 @@ namespace nana
void trigger::mouse_down(graph_reference, const arg_mouse& arg) void trigger::mouse_down(graph_reference, const arg_mouse& arg)
{ {
if(layouter_->press()) //Activates the tab only if left button is clicked.
if(arg.is_left_button() && layouter_->press())
{ {
if(false == layouter_->active_by_trace(arg)) if(false == layouter_->active_by_trace(arg))
layouter_->toolbox_answer(arg); layouter_->toolbox_answer(arg);
@ -1593,10 +1594,10 @@ namespace nana
API::dev::lazy_refresh(); API::dev::lazy_refresh();
} }
void driver::mouse_down(graph_reference graph, const arg_mouse&) void driver::mouse_down(graph_reference graph, const arg_mouse& arg)
{ {
auto & indexes = model_->get_indexes(); auto & indexes = model_->get_indexes();
if ((indexes.hovered_pos == model_->npos) || (indexes.active_pos == indexes.hovered_pos)) if ((indexes.hovered_pos == model_->npos) || (indexes.active_pos == indexes.hovered_pos) || !arg.is_left_button())
return; return;
if (indexes.active_pos != indexes.hovered_pos) if (indexes.active_pos != indexes.hovered_pos)