Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2025-01-11 23:39:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check for widget != nullptr before add/remove child.

Browse Source
This commit is contained in:
Jared Boone 2015-10-16 19:34:22 -07:00
parent dab801e167
commit dc30911e0f
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
firmware/common/ui_widget.cpp
View File

@ -304,10 +304,12 @@ void View::paint(Painter& painter) {
} }
void View::add_child(Widget* const widget) { void View::add_child(Widget* const widget) {
if( widget->parent() == nullptr ) { if( widget ) {
widget->set_parent(this); if( widget->parent() == nullptr ) {
children_.push_back(widget); widget->set_parent(this);
widget->set_dirty(); children_.push_back(widget);
widget->set_dirty();
}
} }
} }
@ -318,11 +320,13 @@ void View::add_children(const std::vector<Widget*>& children) {
} }
void View::remove_child(Widget* const widget) { void View::remove_child(Widget* const widget) {
children_.erase(std::remove(children_.begin(), children_.end(), widget), children_.end()); if( widget ) {
dirty_screen_rect += widget->screen_rect(); children_.erase(std::remove(children_.begin(), children_.end(), widget), children_.end());
widget->set_parent(nullptr); dirty_screen_rect += widget->screen_rect();
if( dirty_screen_rect ) { widget->set_parent(nullptr);
set_dirty(); if( dirty_screen_rect ) {
set_dirty();
}
} }
} }