diff --git a/radio/src/thirdparty/libopenui/src/form.cpp b/radio/src/thirdparty/libopenui/src/form.cpp index c1dd1ce72..3ada0ae14 100644 --- a/radio/src/thirdparty/libopenui/src/form.cpp +++ b/radio/src/thirdparty/libopenui/src/form.cpp @@ -130,7 +130,7 @@ void FormGroup::setFocus(uint8_t flag) break; case SET_FOCUS_FORWARD: // TODO this test should be recursive - if (focusWindow == last || focusWindow->getParent() == last) { + if (focusWindow == last || focusWindow->getParent() == last || focusWindow->getParent()->getParent() == last) { if (next == this) first->setFocus(SET_FOCUS_FORWARD); else if (next) diff --git a/radio/src/thirdparty/libopenui/src/static.h b/radio/src/thirdparty/libopenui/src/static.h index b8ecac3b9..767bd521b 100644 --- a/radio/src/thirdparty/libopenui/src/static.h +++ b/radio/src/thirdparty/libopenui/src/static.h @@ -85,9 +85,14 @@ class StaticBitmap: public Window { } void setBitmap(const char * filename) + { + setBitmap(BitmapBuffer::loadBitmap(filename)); + } + + void setBitmap(const BitmapBuffer * newBitmap) { delete bitmap; - bitmap = BitmapBuffer::loadBitmap(filename); + bitmap = newBitmap; invalidate(); } diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp index 2259ef18f..70c5cc24c 100644 --- a/radio/src/thirdparty/libopenui/src/window.cpp +++ b/radio/src/thirdparty/libopenui/src/window.cpp @@ -407,12 +407,12 @@ coord_t Window::adjustHeight() void Window::moveWindowsTop(coord_t y, coord_t delta) { for (auto child: children) { - if (child->rect.y > y) { + if (child->rect.y >= y) { child->rect.y += delta; invalidate(); } } - innerHeight += delta; + setInnerHeight(innerHeight + delta); } void Window::invalidate(const rect_t & rect)