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

adding treebox scheme

Browse Source
This commit is contained in:
besh81 2019-01-19 15:04:19 +01:00
parent d32d308d4c
commit a71e02b5f2
2 changed files with 50 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -347,13 +347,30 @@ namespace nana
basic_event<arg_treebox> selected; ///< a user selects or unselects a node basic_event<arg_treebox> selected; ///< a user selects or unselects a node
basic_event<arg_treebox> hovered; ///< a user moves the cursor over a node basic_event<arg_treebox> hovered; ///< a user moves the cursor over a node
}; };
struct scheme
: public widget_geometrics
{
color_proxy item_bg_selected{ static_cast<color_rgb>(0xD5EFFC) }; ///< item selected: background color
color_proxy item_fg_selected{ static_cast<color_rgb>(0x99DEFD) }; ///< item selected: foreground color
color_proxy item_bg_highlighted{ static_cast<color_rgb>(0xE8F5FD) }; ///< item highlighted: background color
color_proxy item_fg_highlighted{ static_cast<color_rgb>(0xD8F0FA) }; ///< item highlighted: foreground color
color_proxy item_bg_selected_and_highlighted{ static_cast<color_rgb>(0xC4E8FA) }; ///< item selected and highlighted: background color
color_proxy item_fg_selected_and_highlighted{ static_cast<color_rgb>(0xB6E6FB) }; ///< item selected and highlighted: foreground color
unsigned item_offset{ 16 };
unsigned text_offset{ 4 };
unsigned indent_displacement{ 18 }; ///< children position displacement in pixels (def=18 (before was 10))
};
}//end namespace treebox }//end namespace treebox
}//end namespace drawerbase }//end namespace drawerbase
/// \brief Displays a hierarchical list of items, such as the files and directories on a disk. /// \brief Displays a hierarchical list of items, such as the files and directories on a disk.
/// See also in [documentation](http://nanapro.org/en-us/documentation/widgets/treebox.htm) /// See also in [documentation](http://nanapro.org/en-us/documentation/widgets/treebox.htm)
class treebox class treebox
:public widget_object < category::widget_tag, drawerbase::treebox::trigger, drawerbase::treebox::treebox_events> :public widget_object <category::widget_tag, drawerbase::treebox::trigger, drawerbase::treebox::treebox_events, drawerbase::treebox::scheme>
{ {
public: public:
/// A type refers to the item and is also used to iterate through the nodes. /// A type refers to the item and is also used to iterate through the nodes.

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

@ -238,11 +238,11 @@ namespace nana
switch (affect) switch (affect)
{ {
case 1: case 1:
pos_.x += impl_->shape.indent_pixels; pos_.x += impl_->data.scheme_ptr->indent_displacement;
break; break;
default: default:
if (affect >= 2) if (affect >= 2)
pos_.x -= impl_->shape.indent_pixels * (affect - 1); pos_.x -= impl_->data.scheme_ptr->indent_displacement * (affect - 1);
} }
auto & comp_placer = impl_->data.comp_placer; auto & comp_placer = impl_->data.comp_placer;
@ -301,6 +301,7 @@ namespace nana
{ {
nana::paint::graphics * graph; nana::paint::graphics * graph;
::nana::treebox * widget_ptr; ::nana::treebox * widget_ptr;
::nana::treebox::scheme_type* scheme_ptr;
trigger * trigger_ptr; trigger * trigger_ptr;
pat::cloneable<compset_placer_interface> comp_placer; pat::cloneable<compset_placer_interface> comp_placer;
@ -310,13 +311,11 @@ namespace nana
struct shape_tag struct shape_tag
{ {
nana::upoint border;
std::shared_ptr<nana::scroll<true>> scroll; std::shared_ptr<nana::scroll<true>> scroll;
mutable std::map<std::string, node_image_tag> image_table; mutable std::map<std::string, node_image_tag> image_table;
tree_cont_type::node_type * first; //The node at the top of screen tree_cont_type::node_type * first; //The node at the top of screen
int indent_pixels;
int offset_x; int offset_x;
}shape; }shape;
@ -356,7 +355,6 @@ namespace nana
data.stop_drawing = false; data.stop_drawing = false;
shape.first = nullptr; shape.first = nullptr;
shape.indent_pixels = 10;
shape.offset_x = 0; shape.offset_x = 0;
shape.scroll = std::make_shared<nana::scroll<true>>(); shape.scroll = std::make_shared<nana::scroll<true>>();
@ -451,7 +449,7 @@ namespace nana
data.graph->rectangle(true, data.widget_ptr->bgcolor()); data.graph->rectangle(true, data.widget_ptr->bgcolor());
//Draw tree //Draw tree
attr.tree_cont.for_each(shape.first, item_rendering_director(this, nana::point(static_cast<int>(attr.tree_cont.indent_size(shape.first) * shape.indent_pixels) - shape.offset_x, margin_top_bottom()))); attr.tree_cont.for_each(shape.first, item_rendering_director(this, nana::point(static_cast<int>(attr.tree_cont.indent_size(shape.first) * data.scheme_ptr->indent_displacement) - shape.offset_x, margin_top_bottom())));
if (!ignore_update) if (!ignore_update)
API::update_window(data.widget_ptr->handle()); API::update_window(data.widget_ptr->handle());
@ -711,7 +709,7 @@ namespace nana
case 3: case 3:
//param is the begin pos of an item in absolute. //param is the begin pos of an item in absolute.
{ {
int beg = static_cast<int>(tree.indent_size(node) * shape.indent_pixels) - shape.offset_x; int beg = static_cast<int>(tree.indent_size(node) * data.scheme_ptr->indent_displacement) - shape.offset_x;
int end = beg + static_cast<int>(node_w_pixels(node)); int end = beg + static_cast<int>(node_w_pixels(node));
bool take_adjust = false; bool take_adjust = false;
@ -910,7 +908,7 @@ namespace nana
bool track_mouse(int x, int y) bool track_mouse(int x, int y)
{ {
int xpos = attr.tree_cont.indent_size(shape.first) * shape.indent_pixels - shape.offset_x; int xpos = attr.tree_cont.indent_size(shape.first) * data.scheme_ptr->indent_displacement - shape.offset_x;
item_locator nl(this, xpos, x, y); item_locator nl(this, xpos, x, y);
attr.tree_cont.template for_each<item_locator&>(shape.first, nl); attr.tree_cont.template for_each<item_locator&>(shape.first, nl);
@ -1449,37 +1447,42 @@ namespace nana
if(compset->comp_attribute(component::bground, attr)) if(compset->comp_attribute(component::bground, attr))
{ {
const ::nana::color color_table[][2] = { { { 0xE8, 0xF5, 0xFD }, { 0xD8, 0xF0, 0xFA } }, //highlighted auto scheme_ptr = static_cast<::nana::treebox::scheme_type*>(API::dev::get_scheme(window_handle_));
{ { 0xC4, 0xE8, 0xFA }, { 0xB6, 0xE6, 0xFB } }, //Selected and highlighted
{ { 0xD5, 0xEF, 0xFC }, {0x99, 0xDE, 0xFD } } //Selected but not highlighted
};
const ::nana::color *clrptr = nullptr; const ::nana::color_proxy *bg_ptr = nullptr, *fg_ptr = nullptr;
if(compset->item_attribute().mouse_pointed) if(compset->item_attribute().mouse_pointed)
{ {
if(compset->item_attribute().selected) if(compset->item_attribute().selected)
clrptr = color_table[1]; {
bg_ptr = &scheme_ptr->item_bg_selected_and_highlighted;
fg_ptr = &scheme_ptr->item_fg_selected_and_highlighted;
}
else else
clrptr = color_table[0]; {
bg_ptr = &scheme_ptr->item_bg_highlighted;
fg_ptr = &scheme_ptr->item_fg_highlighted;
}
} }
else if(compset->item_attribute().selected) else if(compset->item_attribute().selected)
clrptr = color_table[2]; {
bg_ptr = &scheme_ptr->item_bg_selected;
fg_ptr = &scheme_ptr->item_fg_selected;
}
if (clrptr) if(bg_ptr)
{ {
if (API::is_transparent_background(window_handle_)) if (API::is_transparent_background(window_handle_))
{ {
paint::graphics item_graph{ attr.area.dimension() }; paint::graphics item_graph{ attr.area.dimension() };
item_graph.rectangle(false, clrptr[1]); item_graph.rectangle(false, *fg_ptr);
item_graph.rectangle(rectangle{attr.area.dimension()}.pare_off(1), true, *clrptr); item_graph.rectangle(rectangle{ attr.area.dimension() }.pare_off(1), true, *bg_ptr);
graph.blend(attr.area, item_graph, attr.area.position(), 0.5); graph.blend(attr.area, item_graph, attr.area.position(), 0.5);
} }
else else
{ {
graph.rectangle(attr.area, false, clrptr[1]); graph.rectangle(attr.area, false, *fg_ptr);
graph.rectangle(attr.area.pare_off(1), true, *clrptr); graph.rectangle(attr.area.pare_off(1), true, *bg_ptr);
} }
} }
} }
@ -1577,10 +1580,10 @@ namespace nana
switch(affect) switch(affect)
{ {
case 0: break; case 0: break;
case 1: item_pos_.x += static_cast<int>(node_desc.indent_pixels); break; case 1: item_pos_.x += static_cast<int>(impl_->data.scheme_ptr->indent_displacement); break;
default: default:
if(affect >= 2) if(affect >= 2)
item_pos_.x -= static_cast<int>(node_desc.indent_pixels) * (affect - 1); item_pos_.x -= static_cast<int>(impl_->data.scheme_ptr->indent_displacement) * (affect - 1);
} }
impl_->assign_node_attr(node_attr_, &node); impl_->assign_node_attr(node_attr_, &node);
@ -1942,7 +1945,8 @@ namespace nana
impl_->data.graph = &graph; impl_->data.graph = &graph;
widget.bgcolor(colors::white); widget.bgcolor(colors::white);
impl_->data.widget_ptr = static_cast< ::nana::treebox*>(&widget); impl_->data.widget_ptr = static_cast<::nana::treebox*>(&widget);
impl_->data.scheme_ptr = static_cast<::nana::treebox::scheme_type*>(API::dev::get_scheme(widget));
widget.caption("nana treebox"); widget.caption("nana treebox");
} }
@ -1961,7 +1965,7 @@ namespace nana
{ {
auto & shape = impl_->shape; auto & shape = impl_->shape;
int xpos = impl_->attr.tree_cont.indent_size(shape.first) * shape.indent_pixels - shape.offset_x; int xpos = impl_->attr.tree_cont.indent_size(shape.first) * impl_->data.scheme_ptr->indent_displacement - shape.offset_x;
item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y); item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y);
impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl); impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl);
@ -1986,7 +1990,7 @@ namespace nana
{ {
auto & shape = impl_->shape; auto & shape = impl_->shape;
int xpos = impl_->attr.tree_cont.indent_size(shape.first) * shape.indent_pixels - shape.offset_x; int xpos = impl_->attr.tree_cont.indent_size(shape.first) * impl_->data.scheme_ptr->indent_displacement - shape.offset_x;
item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y); item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y);
impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl); impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl);
@ -2013,7 +2017,7 @@ namespace nana
{ {
auto & shape = impl_->shape; auto & shape = impl_->shape;
int xpos = impl_->attr.tree_cont.indent_size(shape.first) * shape.indent_pixels - shape.offset_x; int xpos = impl_->attr.tree_cont.indent_size(shape.first) * impl_->data.scheme_ptr->indent_displacement - shape.offset_x;
item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y); item_locator nl(impl_, xpos, arg.pos.x, arg.pos.y);
impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl); impl_->attr.tree_cont.for_each<item_locator&>(shape.first, nl);