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

add selection_box to listbox scheme

Browse Source
This commit is contained in:
Jinhao 2017-01-25 23:25:56 +08:00
parent fdf3753961
commit 8e53602c79
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/nana/gui/widgets/listbox.hpp
View File

@ -1179,6 +1179,8 @@ namespace nana
color_proxy item_selected{ static_cast<color_rgb>(0xD5EFFC) }; color_proxy item_selected{ static_cast<color_rgb>(0xD5EFFC) };
color_proxy item_highlighted{ static_cast<color_rgb>(0xD5EFFC) }; color_proxy item_highlighted{ static_cast<color_rgb>(0xD5EFFC) };
color_proxy selection_box{ static_cast<color_rgb>(0x3399FF) }; ///< Color of selection box border.
/// The max column width which is generated by fit_content is allowed. It is ignored when it is 0, or a max value is passed to fit_content. /// The max column width which is generated by fit_content is allowed. It is ignored when it is 0, or a max value is passed to fit_content.
unsigned max_fit_content{ 0 }; unsigned max_fit_content{ 0 };

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

@ -107,6 +107,7 @@ namespace nana
events_.hover_outside(curs); events_.hover_outside(curs);
API::refresh_window(window_handle_); API::refresh_window(window_handle_);
this->sync(false);
} }
else else
tmr_.stop(); tmr_.stop();
@ -3904,22 +3905,20 @@ namespace nana
//Check if the mouse selection box is present. //Check if the mouse selection box is present.
if (essence_->mouse_selection.begin_position != essence_->mouse_selection.end_position) if (essence_->mouse_selection.begin_position != essence_->mouse_selection.end_position)
{ {
rectangle box{ point box_position{
point{
std::min(essence_->mouse_selection.begin_position.x, essence_->mouse_selection.end_position.x), std::min(essence_->mouse_selection.begin_position.x, essence_->mouse_selection.end_position.x),
std::min(essence_->mouse_selection.begin_position.y, essence_->mouse_selection.end_position.y) std::min(essence_->mouse_selection.begin_position.y, essence_->mouse_selection.end_position.y)
}, };
size{ size box_size{
static_cast<size::value_type>(std::abs(essence_->mouse_selection.begin_position.x - essence_->mouse_selection.end_position.x)), static_cast<size::value_type>(std::abs(essence_->mouse_selection.begin_position.x - essence_->mouse_selection.end_position.x)),
static_cast<size::value_type>(std::abs(essence_->mouse_selection.begin_position.y - essence_->mouse_selection.end_position.y)) static_cast<size::value_type>(std::abs(essence_->mouse_selection.begin_position.y - essence_->mouse_selection.end_position.y))
}
}; };
box.position(essence_->coordinate_cast(box.position(), false)); paint::graphics box_graph{ box_size };
box_graph.rectangle(true, essence_->scheme_ptr->selection_box.get_color().blend(colors::white, 0.6));
box_graph.rectangle(false, essence_->scheme_ptr->selection_box.get_color());
rectangle visual_box; box_graph.blend(rectangle{ box_size }, *essence_->graph, essence_->coordinate_cast(box_position, false), 0.5);
if(overlap(box, rect, visual_box))
essence_->graph->rectangle(visual_box, false, colors::blue);
} }
} }
private: private: