Cosmetics
This commit is contained in:
+1
-1
@@ -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)
|
||||
|
||||
+6
-1
@@ -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();
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user