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

fix bug that nested_form mistakely renders sibling as its child

Browse Source
This commit is contained in:
Jinhao 2018-08-15 23:07:38 +08:00
parent c6f5dc0f1b
commit 841fa0812c
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/gui/detail/window_layout.cpp
View File

@ -166,10 +166,18 @@ namespace nana
if (!cover->visible) if (!cover->visible)
continue; continue;
if (is_wd_root ? if (is_wd_root)
(category::flags::root == cover->other.category) {
: if(category::flags::root == cover->other.category)
((category::flags::root != cover->other.category) && (nullptr == cover->effect.bground))) {
if (overlap(vis_rect, rectangle{ native_interface::window_position(cover->root), cover->dimension }, block.r))
{
block.window = cover;
blocks.push_back(block);
}
}
}
else if((category::flags::root != cover->other.category) && (nullptr == cover->effect.bground))
{ {
if (overlap(vis_rect, rectangle{ cover->pos_root, cover->dimension }, block.r)) if (overlap(vis_rect, rectangle{ cover->pos_root, cover->dimension }, block.r))
{ {