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

minor changes

Browse Source
This commit is contained in:
Jinhao 2016-06-02 01:01:03 +08:00
parent 62d4bd984d
commit 32d988e1a7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,8 @@
#ifndef NANA_GUI_WIDGETS_LISTBOX_HPP #ifndef NANA_GUI_WIDGETS_LISTBOX_HPP
#define NANA_GUI_WIDGETS_LISTBOX_HPP #define NANA_GUI_WIDGETS_LISTBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp" #include "widget.hpp"
#include "detail/inline_widget.hpp" #include "detail/inline_widget.hpp"
#include <nana/pat/abstract_factory.hpp> #include <nana/pat/abstract_factory.hpp>
@ -747,4 +749,6 @@ the nana::detail::basic_window member pointer scheme
void _m_erase_key(nana::detail::key_interface*); void _m_erase_key(nana::detail::key_interface*);
}; };
}//end namespace nana }//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif #endif

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

@ -2341,7 +2341,7 @@ namespace nana
unsigned auto_width(size_type pos, unsigned max = 100000) unsigned auto_width(size_type pos, unsigned max = 100000)
{ {
max = std::min(max, scheme_ptr->max_header_width); max = (std::min)(max, scheme_ptr->max_header_width);
unsigned max_w{ 0 }; unsigned max_w{ 0 };
for (const auto &cat : lister.cat_container()) for (const auto &cat : lister.cat_container())
for (const auto &it : cat.items) for (const auto &it : cat.items)
@ -2357,7 +2357,7 @@ namespace nana
unsigned ext_w = scheme_ptr->ext_w; unsigned ext_w = scheme_ptr->ext_w;
if (pos == 0 && checkable) // only before the first column (display_order=0 ?) if (pos == 0 && checkable) // only before the first column (display_order=0 ?)
ext_w += 18; // add to geom. scheme (width of the checker) ?? ext_w += 18; // add to geom. scheme (width of the checker) ??
header.item_width(pos, std::min(max, max_w + ext_w + 1 )); header.item_width(pos, (std::min)(max, max_w + ext_w + 1 ));
return max_w; return max_w;
} }
@ -3069,7 +3069,7 @@ namespace nana
bgcolor = bgcolor.blend(essence_->scheme_ptr->item_selected, 0.7); /// \todo create a parametre for amount of blend bgcolor = bgcolor.blend(essence_->scheme_ptr->item_selected, 0.7); /// \todo create a parametre for amount of blend
} }
unsigned show_w = std::min(content_r.width, width - essence_->scroll.offset_x); unsigned show_w = (std::min)(content_r.width, width - essence_->scroll.offset_x);
auto graph = essence_->graph; auto graph = essence_->graph;
@ -3230,7 +3230,7 @@ namespace nana
graph->palette(false, bgcolor); // we need to erase the excess, because some cell may not draw text over graph->palette(false, bgcolor); // we need to erase the excess, because some cell may not draw text over
graph->rectangle(rectangle( item_right, y /*+ 2*/, excess, essence_->scheme_ptr->item_height /*- 4*/ ), true); graph->rectangle(rectangle( item_right, y /*+ 2*/, excess, essence_->scheme_ptr->item_height /*- 4*/ ), true);
} }
extreme_text = std::max(extreme_text, text_right); extreme_text = (std::max)(extreme_text, text_right);
} }
} }
} }
@ -3343,10 +3343,7 @@ namespace nana
void trigger::attached(widget_reference widget, graph_reference graph) void trigger::attached(widget_reference widget, graph_reference graph)
{ {
//essence_->scheme_ptr = &static_cast<::nana::listbox&>(widget).scheme();
//essence_->scheme_ptr->debug_print("In trigger::attached with &static_cast<::nana::listbox&>(widget).scheme();");
essence_->scheme_ptr = static_cast<::nana::listbox::scheme_type*>(API::dev::get_scheme(widget)); essence_->scheme_ptr = static_cast<::nana::listbox::scheme_type*>(API::dev::get_scheme(widget));
//essence_->scheme_ptr->debug_print("In trigger::attached with static_cast<::nana::listbox::scheme_type*>(API::dev::get_scheme(widget));");
essence_->graph = &graph; essence_->graph = &graph;
typeface_changed(graph); typeface_changed(graph);