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

Merge remote-tracking branch 'nana/hotfixes-1.0.1' into hotfixes-1.0.1

Browse Source
This commit is contained in:
qPCR4vir 2015-03-17 23:16:13 +01:00
commit 219fb1b7d4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/gui/place.cpp
View File

@ -1,4 +1,4 @@
/* /**
* An Implementation of Place for Layout * An Implementation of Place for Layout
* Nana C++ Library(http://www.nanapro.org) * Nana C++ Library(http://www.nanapro.org)
* Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com) * Copyright(C) 2003-2014 Jinhao(cnjinhao@hotmail.com)
@ -1565,8 +1565,9 @@ namespace nana
auto px_ptr = &nana::rectangle::width; auto px_ptr = &nana::rectangle::width;
auto area_left = leaf_left_->margin_area(); //Use field_area of leaf, not margin_area. Otherwise splitter would be at wrong position
auto area_right = leaf_right_->margin_area(); auto area_left = leaf_left_->field_area;
auto area_right = leaf_right_->field_area;
if (nana::cursor::size_we != splitter_cursor_) if (nana::cursor::size_we != splitter_cursor_)
{ {
@ -2151,8 +2152,6 @@ namespace nana
if (impl_->root_division && impl_->window_handle) if (impl_->root_division && impl_->window_handle)
{ {
impl_->root_division->field_area = API::window_size(impl_->window_handle); impl_->root_division->field_area = API::window_size(impl_->window_handle);
if (impl_->root_division->field_area.empty()) return;
impl_->root_division->collocate(impl_->window_handle); impl_->root_division->collocate(impl_->window_handle);
for (auto & field : impl_->fields) for (auto & field : impl_->fields)