This commit is contained in:
qPCR4vir 2016-03-27 21:03:40 +02:00
parent e7b8e603e4
commit feb26995da
2 changed files with 35 additions and 5 deletions

View File

@ -17,8 +17,6 @@
#ifndef NANA_GUI_WIDGETS_LISTBOX_HPP
#define NANA_GUI_WIDGETS_LISTBOX_HPP
#include <nana/push_ignore_diagnostic>
#include "widget.hpp"
#include "detail/inline_widget.hpp"
#include <nana/pat/abstract_factory.hpp>
@ -541,6 +539,8 @@ namespace nana
unsigned header_mouse_spliter_area_before{ 4 }; ///< def=2
unsigned header_mouse_spliter_area_after { 4 }; ///< def=3
void debug_print(const std::string &msg);
};
}
}//end namespace drawerbase
@ -747,6 +747,4 @@ the nana::detail::basic_window member pointer scheme
void _m_erase_key(nana::detail::key_interface*);
};
}//end namespace nana
#include <nana/pop_ignore_diagnostic>
#endif

View File

@ -28,13 +28,33 @@
#include <algorithm>
#include <nana/system/dataexch.hpp>
#include <cassert>
#include <iostream> // for debug
namespace nana
{
{
void debug(const std::string &msg, const rectangle&r)
{
std::cerr <<"\n" <<msg << "(" << r.x << ", " << r.y << " (" << r.width << ", " << r.height << ") )";
}
namespace drawerbase
{
namespace listbox
{
void scheme::debug_print(const std::string &msg)
{
std::cerr << "\n " << msg;
std::cerr << "\n max_header_width: " << max_header_width;
std::cerr << "\n min_header_width: " << min_header_width;
std::cerr << "\n suspension_width: " << suspension_width;
std::cerr << "\n ext_w: " << ext_w;
std::cerr << "\n header_height: " << header_height;
std::cerr << "\n text_height: " << text_height;
std::cerr << "\n item_height_ex: " << item_height_ex;
std::cerr << "\n item_height: " << item_height;
std::cerr << "\n header_mouse_spliter_area_before: " << header_mouse_spliter_area_before;
std::cerr << "\n header_mouse_spliter_area_after: " << header_mouse_spliter_area_after;
}
//struct cell
cell::format::format(const ::nana::color& bgcolor, const ::nana::color& fgcolor)
: bgcolor{ bgcolor }, fgcolor{ fgcolor }
@ -3321,7 +3341,11 @@ namespace nana
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->debug_print("In trigger::attached with static_cast<::nana::listbox::scheme_type*>(API::dev::get_scheme(widget));");
essence_->graph = &graph;
typeface_changed(graph);
@ -3348,10 +3372,18 @@ namespace nana
nana::rectangle r;
essence_->scheme_ptr->debug_print("From trigger::refresh(graph_reference) ");
if (essence_->header.visible() && essence_->rect_header(r))
drawer_header_->draw(r);
debug("Header: ", r);
if (essence_->rect_lister(r))
drawer_lister_->draw(r);
debug("Lister: ", r);
_m_draw_border();
}