ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-01-18 18:56:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

menu_view: handle disppearing child widgets

Browse Source
This commit is contained in:
Norman Feske 2017-07-26 16:04:30 +02:00 committed by Christian Helmuth
parent 569741faf2
commit 80324d9f54
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
repos/gems/src/app/menu_view/widgets.h
View File

@ -150,7 +150,7 @@ class Menu_view::Widget : public List<Widget>::Element
node.for_each_sub_node([&] (Xml_node sub_node) {
if (sub_node.attribute_value("name", Name()) == name)
result = true; });
return result;
}
@ -167,13 +167,22 @@ class Menu_view::Widget : public List<Widget>::Element
void _update_child(Xml_node node)
{
Widget *w = _children.first();
unsigned const num_sub_nodes = node.num_sub_nodes();
/* remove widget of vanished child */
if (w && num_sub_nodes == 0)
_remove_child(w);
if (Widget *w = _children.first()) {
/* remove widget of vanished child */
if (num_sub_nodes == 0)
_remove_child(w);
/* remove child widget if type or name changed */
if (num_sub_nodes > 0) {
Xml_node const child_node = node.sub_node();
if (child_node.type() != w->_type_name
|| child_node.attribute_value("name", Name()) != w->_name)
_remove_child(w);
}
}
if (num_sub_nodes == 0)
return;
@ -263,8 +272,6 @@ class Menu_view::Widget : public List<Widget>::Element
previous = w;
w = w->next();
});
}
void _draw_children(Surface<Pixel_rgb888> &pixel_surface,