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

Merge branch 'besh81-develop' into develop

Browse Source
This commit is contained in:
Jinhao 2020-02-08 07:31:40 +08:00
commit 2c9f82979b
2 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/nana/gui/widgets/treebox.hpp
View File

@ -492,6 +492,14 @@ namespace nana
/// Gets the current hovered node. /// Gets the current hovered node.
item_proxy hovered(bool exclude_expander) const; item_proxy hovered(bool exclude_expander) const;
/// Enable/disable the interactions (selection, click, ...) on the entire line of the treebox.
/**
* @param enable bool whether to enable.
*/
void use_entire_line(bool enable);
private: private:
std::shared_ptr<scroll_operation_interface> _m_scroll_operation() override; std::shared_ptr<scroll_operation_interface> _m_scroll_operation() override;

23
source/gui/widgets/treebox.cpp
View File

@ -295,7 +295,12 @@ namespace nana
if (impl_->data.comp_placer->locate(comp, node_attr_, &attr.area)) if (impl_->data.comp_placer->locate(comp, node_attr_, &attr.area))
{ {
attr.mouse_pointed = node_attr_.mouse_pointed; attr.mouse_pointed = node_attr_.mouse_pointed;
attr.area.x += pos_.x;
if(comp == component_t::bground && impl_->use_entire_line)
attr.area.width = impl_->visible_w_pixels();
else
attr.area.x += pos_.x;
attr.area.y += pos_.y; attr.area.y += pos_.y;
return true; return true;
} }
@ -362,6 +367,9 @@ namespace nana
std::size_t scroll_timestamp; std::size_t scroll_timestamp;
nana::timer timer; nana::timer timer;
}adjust; }adjust;
bool use_entire_line;
public: public:
implementation() implementation()
{ {
@ -386,6 +394,8 @@ namespace nana
adjust.offset_x_adjust = 0; adjust.offset_x_adjust = 0;
adjust.node = nullptr; adjust.node = nullptr;
adjust.scroll_timestamp = 0; adjust.scroll_timestamp = 0;
use_entire_line = false;
} }
void assign_node_attr(node_attribute& ndattr, const node_type* node) const void assign_node_attr(node_attribute& ndattr, const node_type* node) const
@ -1675,8 +1685,8 @@ namespace nana
nana::rectangle r = node_r; nana::rectangle r = node_r;
if (!comp_placer->locate(static_cast<component>(comp), node_attr_, &r)) if (!comp_placer->locate(static_cast<component>(comp), node_attr_, &r))
continue; continue;
if (r.is_hit(logic_pos)) if((comp == static_cast<int>(component::bground) && impl_->use_entire_line) || r.is_hit(logic_pos))
{ {
node_ = &node; node_ = &node;
what_ = static_cast<component>(comp); what_ = static_cast<component>(comp);
@ -2023,6 +2033,7 @@ namespace nana
{ {
case component::icon: case component::icon:
case component::text: case component::text:
case component::bground:
impl_->set_expanded(node, !node->value.second.expanded); impl_->set_expanded(node, !node->value.second.expanded);
impl_->draw(true, true, false); impl_->draw(true, true, false);
API::dev::lazy_refresh(); API::dev::lazy_refresh();
@ -2448,6 +2459,12 @@ namespace nana
return item_proxy(const_cast<drawer_trigger_t*>(dw), dw->impl()->node_state.pointed); return item_proxy(const_cast<drawer_trigger_t*>(dw), dw->impl()->node_state.pointed);
} }
void treebox::use_entire_line(bool enable)
{
auto dw = &get_drawer_trigger();
dw->impl()->use_entire_line = enable;
}
std::shared_ptr<scroll_operation_interface> treebox::_m_scroll_operation() std::shared_ptr<scroll_operation_interface> treebox::_m_scroll_operation()
{ {
internal_scope_guard lock; internal_scope_guard lock;