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

some small place fixes

Browse Source
This commit is contained in:
Jinhao
2015-09-23 23:59:31 +08:00
parent 8d4ffa068d
commit b6dd03e2d5
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/gui/place.cpp
View File

@@ -1737,6 +1737,9 @@ namespace nana
decltype(dockable_field->dockarea) del(ptr); decltype(dockable_field->dockarea) del(ptr);
}); });
this->set_display(false);
impl_ptr_->collocate();
API::close_window(window_handle); API::close_window(window_handle);
} }
private: private:

41
source/gui/place_parts.hpp
View File

@@ -301,30 +301,35 @@ namespace nana
else else
r.height = 0; r.height = 0;
if (!tabbar_ && panels_.size() > 0) if (!tabbar_)
{ {
tabbar_.reset(new tabbar_lite(*this)); if (panels_.size() > 0)
tabbar_->events().selected.clear();
tabbar_->events().selected([this]
{ {
auto handle = tabbar_->attach(tabbar_->selected()); tabbar_.reset(new tabbar_lite(*this));
if (handle)
caption_.caption(API::window_caption(handle));
else
caption_.caption(::nana::string());
});
tabbar_->move({ 0, r.bottom() - 20, r.width, 20 }); tabbar_->events().selected.clear();
r.height -= 20; tabbar_->events().selected([this]
{
auto handle = tabbar_->attach(tabbar_->selected());
if (handle)
caption_.caption(API::window_caption(handle));
else
caption_.caption(::nana::string());
});
std::size_t pos = 0; tabbar_->move({ 0, r.bottom() - 20, r.width, 20 });
for (auto & pn : panels_) r.height -= 20;
{
tabbar_->push_back(::nana::charset(pn.widget_ptr->caption())); std::size_t pos = 0;
tabbar_->attach(pos++, *pn.widget_ptr); for (auto & pn : panels_)
{
tabbar_->push_back(::nana::charset(pn.widget_ptr->caption()));
tabbar_->attach(pos++, *pn.widget_ptr);
}
} }
} }
else
r.height -= 20;
auto wdg = fn(*this); auto wdg = fn(*this);