From 61f8834c42fa721ca25e4fac8ece82d355306fc0 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 16 Apr 2020 16:28:33 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/thirdparty/libopenui/src/expansion_panel.h | 8 +++++++-
 radio/src/thirdparty/libopenui/src/window.cpp        | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/expansion_panel.h b/radio/src/thirdparty/libopenui/src/expansion_panel.h
index 6092b293c..c3de410fc 100644
--- a/radio/src/thirdparty/libopenui/src/expansion_panel.h
+++ b/radio/src/thirdparty/libopenui/src/expansion_panel.h
@@ -67,7 +67,13 @@ class ExpansionPanel: public FormGroup {
     void open(bool state = true)
     {
       isOpen = state;
-      coord_t newHeight = (state ? header->height() + body->height() : header->height());
+      updateHeight();
+    }
+
+    void updateHeight()
+    {
+      body->adjustInnerHeight();
+      coord_t newHeight = (isOpen ? header->height() + body->height() : header->height());
       parent->moveWindowsTop(bottom(), newHeight - height());
       setHeight(newHeight);
     }
diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index 69d068cd6..69219c532 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -418,11 +418,11 @@ bool Window::onTouchSlide(coord_t x, coord_t y, coord_t startX, coord_t startY,
 
 void Window::adjustInnerHeight()
 {
-  innerHeight = 0;
+  coord_t bottomMax = 0;
   for (auto child: children) {
-    innerHeight = max(innerHeight, child->rect.y + child->rect.h);
+    bottomMax = max(bottomMax, child->rect.y + child->rect.h);
   }
-  invalidate();
+  setInnerHeight(bottomMax);
 }
 
 coord_t Window::adjustHeight()