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

fix bug that nested_form draws incompletely

Browse Source
This commit is contained in:
Jinhao
2018-01-28 13:57:07 +08:00
parent 2574f4fffa
commit 9bd3dc7e58
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,43 +106,46 @@ namespace nana
visual = rectangle{ wd->pos_root, wd->dimension }; visual = rectangle{ wd->pos_root, wd->dimension };
if (wd->root_widget != wd) if (category::flags::root != wd->other.category)
{ {
//Test if the root widget is overlapped the specified widget //Test if the root widget is overlapped the specified widget
//the pos of root widget is (0, 0) //the pos of root widget is (0, 0)
if (overlapped(visual, rectangle{ wd->root_widget->pos_owner, wd->root_widget->dimension }) == false) if (overlapped(visual, rectangle{ wd->root_widget->pos_owner, wd->root_widget->dimension }) == false)
return false; return false;
}
for (auto parent = wd->parent; parent; parent = parent->parent) for (auto parent = wd->parent; parent; parent = parent->parent)
{
if (category::flags::root == parent->other.category)
{ {
//visual rectangle of wd's parent if (category::flags::root == parent->other.category)
rectangle vrt_parent{parent->pos_root, parent->dimension};
point pos_root;
while (parent->parent)
{ {
pos_root -= native_interface::window_position(parent->root); wd = parent;
break;
if (!overlap(rectangle{ pos_root, parent->parent->root_widget->dimension }, vrt_parent, vrt_parent))
return false;
parent = parent->parent->root_widget;
} }
if (!overlap(vrt_parent, visual, visual)) if (!overlap(rectangle{ parent->pos_root, parent->dimension }, visual, visual))
return false; return false;
return true;
} }
if (!overlap(rectangle{ parent->pos_root, parent->dimension }, visual, visual))
return false;
} }
return true; //Now, wd actually is the root widget of original parameter wd
if (nullptr == wd->parent)
return true;
auto parent_rw = wd->parent->root_widget;
//visual rectangle of wd's parent
rectangle vrt_parent{ parent_rw->pos_root, parent_rw->dimension };
point pos_root;
while (parent_rw->parent)
{
pos_root -= native_interface::window_position(parent_rw->root);
if (!overlap(rectangle{ pos_root, parent_rw->parent->root_widget->dimension }, vrt_parent, vrt_parent))
return false;
parent_rw = parent_rw->parent->root_widget;
}
return overlap(vrt_parent, visual, visual);
} }
//read_overlaps //read_overlaps