From df698e9ff29694efde446d2dc05c1ea8e4a1f876 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 9 Oct 2015 23:31:38 +0200
Subject: [PATCH] Cosmetics

---
 .../gui/Horus/menu_model_logical_switches.cpp |  2 +-
 radio/src/gui/Horus/widgets.cpp               | 22 +++++--------------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/radio/src/gui/Horus/menu_model_logical_switches.cpp b/radio/src/gui/Horus/menu_model_logical_switches.cpp
index 7d20c6eef..5c2afc723 100644
--- a/radio/src/gui/Horus/menu_model_logical_switches.cpp
+++ b/radio/src/gui/Horus/menu_model_logical_switches.cpp
@@ -105,7 +105,7 @@ void menuModelLogicalSwitches(evt_t event)
   int sub = m_posVert;
   horzpos_t horz = m_posHorz;
 
-  if (horz>=0) {
+  if (sub>= 0 && horz>=0) {
     displayColumnHeader(STR_CSW_HEADERS, horz);
   }
 
diff --git a/radio/src/gui/Horus/widgets.cpp b/radio/src/gui/Horus/widgets.cpp
index 70a3566a6..388e7e10d 100644
--- a/radio/src/gui/Horus/widgets.cpp
+++ b/radio/src/gui/Horus/widgets.cpp
@@ -82,13 +82,6 @@ void lcdDrawCheckBox(coord_t x, coord_t y, uint8_t value, LcdFlags attr)
   }
 }
 
-void displayScreenIndex(uint8_t index, uint8_t count)
-{
-  // char str[10];
-  // sprintf(str, "%d/%d", index+1, count);
-  // lcd_putsAtt(LCD_W-8-getTextWidth(str), MENU_FOOTER_TOP, str, m_posVert < 0 ? INVERS : TEXT_COLOR);
-}
-
 void displayScrollbar(coord_t x, coord_t y, coord_t h, uint16_t offset, uint16_t count, uint8_t visible)
 {
   lcdDrawVerticalLine(x, y, h, LINE_COLOR);
@@ -225,12 +218,12 @@ void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCoun
 
   lcdDrawBitmapPattern(0, 0, LBM_TOP_POLYGON, TITLE_BGCOLOR);
 
-  lcdDrawBitmapPattern(5, 5, LBM_MENU_MODEL, MENU_TITLE_COLOR);
+  lcdDrawBitmapPattern(5, 7, LBM_MENU_MODEL, MENU_TITLE_COLOR);
 
   if (m_posVert < 0) {
-    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-11, 0, LBM_CURRENT_BG, TITLE_BGCOLOR);
-    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-11, 0, LBM_CURRENT_SHADOW, TEXT_COLOR);
-    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-12, 0, LBM_CURRENT_BG, TITLE_BGCOLOR);
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-12, 0, LBM_CURRENT_SHADOW, TEXT_COLOR);
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-1, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
   }
   else {
     lcdDrawFilledRect(58+pageIndex*MENU_ICONS_SPACING-11, 0, 36, MENU_HEADER_HEIGHT, TITLE_BGCOLOR);
@@ -238,18 +231,13 @@ void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCoun
   }
 
   for (int i=0; i<pageCount; i++) {
-    lcdDrawBitmapPattern(50+i*MENU_ICONS_SPACING, 7, LBM_MODEL_ICONS[i], MENU_TITLE_COLOR);
+    lcdDrawBitmapPattern((m_posVert < 0 && pageIndex == i) ? 49+i*MENU_ICONS_SPACING : 50+i*MENU_ICONS_SPACING, 7, LBM_MODEL_ICONS[i], MENU_TITLE_COLOR);
   }
 
-
   if (name) {
     // header
     title(name);
   }
-
-  if (pageCount > 0) {
-    displayScreenIndex(pageIndex, pageCount);
-  }
 }
 
 select_menu_value_t selectMenuItem(coord_t x, coord_t y, const pm_char *label, const pm_char *values, select_menu_value_t value, select_menu_value_t min, select_menu_value_t max, LcdFlags attr, evt_t event)