Merge branch 'hotfix-1.4.1' into develop
This commit is contained in:
@@ -12,6 +12,9 @@
|
||||
* @Author: Stefan Pfeifer(st-321), Ariel Vina-Rodriguez (qPCR4vir)
|
||||
*
|
||||
* @brief group is a widget used to visually group and layout other widgets.
|
||||
*
|
||||
* @contributor:
|
||||
* dankan1890(https://github.com/dankan1890)
|
||||
*/
|
||||
|
||||
|
||||
@@ -77,6 +80,9 @@ namespace nana{
|
||||
|
||||
if (options.empty())
|
||||
place_content.field_display(field_options, false);
|
||||
|
||||
if (caption.caption().empty())
|
||||
place_content.field_display(field_title, false);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2311,7 +2311,7 @@ namespace nana{ namespace widgets
|
||||
{
|
||||
auto text = _m_make_select_string();
|
||||
if (!text.empty())
|
||||
nana::system::dataexch().set(text);
|
||||
nana::system::dataexch().set(text, API::root(this->window_));
|
||||
}
|
||||
|
||||
void text_editor::cut()
|
||||
|
||||
@@ -866,8 +866,7 @@ namespace nana
|
||||
item_proxy& item_proxy::check(bool ck)
|
||||
{
|
||||
trigger_->check(node_, ck ? checkstate::checked : checkstate::unchecked);
|
||||
if(trigger_->draw())
|
||||
API::update_window(trigger_->impl()->data.widget_ptr->handle());
|
||||
trigger_->draw();
|
||||
return *this;
|
||||
}
|
||||
|
||||
@@ -1664,7 +1663,8 @@ namespace nana
|
||||
if (!impl_->attr.auto_draw)
|
||||
return false;
|
||||
|
||||
impl_->draw(false);
|
||||
if(impl_->draw(false))
|
||||
API::update_window(impl_->data.widget_ptr->handle());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -2198,6 +2198,13 @@ namespace nana
|
||||
return get_drawer_trigger().checkable();
|
||||
}
|
||||
|
||||
void treebox::clear()
|
||||
{
|
||||
auto impl = get_drawer_trigger().impl();
|
||||
impl->attr.tree_cont.clear();
|
||||
get_drawer_trigger().draw();
|
||||
}
|
||||
|
||||
treebox::node_image_type& treebox::icon(const std::string& id) const
|
||||
{
|
||||
return get_drawer_trigger().icon(id);
|
||||
|
||||
Reference in New Issue
Block a user