Git-Mirrors/portapack-mayhem
1
0
Fork 0
mirror of https://github.com/eried/portapack-mayhem.git synced 2024-10-01 01:26:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Widget/View: Consolidate dirty code inside Widget.

Browse Source
This commit is contained in:
Jared Boone 2016-09-05 15:04:28 -07:00
parent 8a69b0523e
commit 09222f0044
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
firmware/common/ui_widget.cpp
View File

@ -70,12 +70,19 @@ Widget* Widget::parent() const {
} }
void Widget::set_parent(Widget* const widget) { void Widget::set_parent(Widget* const widget) {
if( widget == parent_ ) {
return;
}
if( parent_ && !widget ) { if( parent_ && !widget ) {
// We have a parent, but are losing it. Update visible status. // We have a parent, but are losing it. Update visible status.
dirty_overlapping_children_in_rect(screen_rect());
visible(false); visible(false);
} }
parent_ = widget; parent_ = widget;
set_dirty();
} }
void Widget::set_dirty() { void Widget::set_dirty() {
@ -227,7 +234,6 @@ void View::add_child(Widget* const widget) {
if( widget->parent() == nullptr ) { if( widget->parent() == nullptr ) {
widget->set_parent(this); widget->set_parent(this);
children_.push_back(widget); children_.push_back(widget);
widget->set_dirty();
} }
} }
} }
@ -236,14 +242,12 @@ void View::add_children(const std::initializer_list<Widget*> children) {
children_.insert(std::end(children_), children); children_.insert(std::end(children_), children);
for(auto child : children) { for(auto child : children) {
child->set_parent(this); child->set_parent(this);
child->set_dirty();
} }
} }
void View::remove_child(Widget* const widget) { void View::remove_child(Widget* const widget) {
if( widget ) { if( widget ) {
children_.erase(std::remove(children_.begin(), children_.end(), widget), children_.end()); children_.erase(std::remove(children_.begin(), children_.end(), widget), children_.end());
dirty_overlapping_children_in_rect(widget->screen_rect());
widget->set_parent(nullptr); widget->set_parent(nullptr);
} }
} }