From c686a9406683dab77016d19b7b43ce598c6ba989 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 2 Apr 2020 21:53:06 +0200
Subject: [PATCH] Cosmetics

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

diff --git a/radio/src/thirdparty/libopenui/src/menu.cpp b/radio/src/thirdparty/libopenui/src/menu.cpp
index 998c86d3a..5827c11cc 100644
--- a/radio/src/thirdparty/libopenui/src/menu.cpp
+++ b/radio/src/thirdparty/libopenui/src/menu.cpp
@@ -77,7 +77,7 @@ void MenuBody::paint(BitmapBuffer * dc)
     auto & line = lines[i];
     LcdFlags flags = MENU_COLOR | MENU_FONT;
     if (selectedIndex == i) {
-      flags = MENU_HIGHLIGHT_COLOR;
+      flags = MENU_HIGHLIGHT_COLOR | MENU_FONT;
       if (MENU_HIGHLIGHT_BGCOLOR != MENU_BGCOLOR)
         dc->drawSolidFilledRect(0, i * MENUS_LINE_HEIGHT, width(), MENUS_LINE_HEIGHT, MENU_HIGHLIGHT_BGCOLOR);
     }
diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index d8ea137ed..6cafc4f59 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -51,12 +51,12 @@ Window::~Window()
   deleteChildren();
 }
 
-void Window::attach(Window * window)
+void Window::attach(Window * newParent)
 {
   if (parent)
     detach();
-  parent = window;
-  parent->addChild(this);
+  parent = newParent;
+  newParent->addChild(this);
 }
 
 void Window::detach()
diff --git a/radio/src/thirdparty/libopenui/src/window.h b/radio/src/thirdparty/libopenui/src/window.h
index f4e4d7202..8a49b3ace 100644
--- a/radio/src/thirdparty/libopenui/src/window.h
+++ b/radio/src/thirdparty/libopenui/src/window.h
@@ -323,6 +323,8 @@ class Window {
 
     virtual void checkEvents();
 
+    void attach(Window * window);
+
     void detach();
 
   protected:
@@ -345,8 +347,6 @@ class Window {
     std::function<void()> closeHandler;
     std::function<void()> focusHandler;
 
-    void attach(Window * window);
-
     void addChild(Window * window, bool front = false)
     {
       if (front)