From 4a828eae075348d5a02a0fb151bd984326dd7c99 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Wed, 9 Dec 2020 15:46:03 +0100
Subject: [PATCH] Cosmetics

---
 radio/src/thirdparty/libopenui/src/expansion_panel.cpp | 3 ++-
 radio/src/thirdparty/libopenui/src/expansion_panel.h   | 8 +++++---
 radio/src/thirdparty/libopenui/src/form.h              | 5 +++++
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/radio/src/thirdparty/libopenui/src/expansion_panel.cpp b/radio/src/thirdparty/libopenui/src/expansion_panel.cpp
index 53ef22fe4..a561454e2 100644
--- a/radio/src/thirdparty/libopenui/src/expansion_panel.cpp
+++ b/radio/src/thirdparty/libopenui/src/expansion_panel.cpp
@@ -45,8 +45,9 @@ void ExpansionPanelHeader::onEvent(event_t event)
   }
   else if (event == EVT_ROTARY_LEFT) {
     auto previous = panel->getPreviousField();
-    if (previous)
+    if (previous) {
       previous->setFocus(SET_FOCUS_BACKWARD);
+    }
   }
   else {
     FormGroup::onEvent(event);
diff --git a/radio/src/thirdparty/libopenui/src/expansion_panel.h b/radio/src/thirdparty/libopenui/src/expansion_panel.h
index 5aa7380c4..77b2eaeb1 100644
--- a/radio/src/thirdparty/libopenui/src/expansion_panel.h
+++ b/radio/src/thirdparty/libopenui/src/expansion_panel.h
@@ -23,7 +23,8 @@
 
 class ExpansionPanel;
 
-class ExpansionPanelHeader: virtual public FormGroup {
+class ExpansionPanelHeader: virtual public FormGroup
+{
   public:
     explicit ExpansionPanelHeader(ExpansionPanel * parent);
 
@@ -42,7 +43,8 @@ class ExpansionPanelHeader: virtual public FormGroup {
 };
 
 
-class ExpansionPanel: public FormGroup {
+class ExpansionPanel: public FormGroup
+{
   friend class ExpansionPanelHeader;
 
   public:
@@ -82,7 +84,7 @@ class ExpansionPanel: public FormGroup {
     FormGroup * body = nullptr;
 
   protected:
-    Window * header = nullptr;
+    ExpansionPanelHeader * header = nullptr;
     bool isOpen = false;
 };
 
diff --git a/radio/src/thirdparty/libopenui/src/form.h b/radio/src/thirdparty/libopenui/src/form.h
index d2ccdd437..eab6cfde7 100644
--- a/radio/src/thirdparty/libopenui/src/form.h
+++ b/radio/src/thirdparty/libopenui/src/form.h
@@ -135,6 +135,11 @@ class FormGroup: public FormField
 
     void addField(FormField * field, bool front = false);
 
+    void setFirstField(FormField * field)
+    {
+      first = field;
+    }
+
     void setLastField(FormField * field)
     {
       last = field;