From b3979d9fff5e917d82db21b4180198961d2f9bf7 Mon Sep 17 00:00:00 2001
From: martin <mhotar@gmail.com>
Date: Sun, 11 Oct 2015 22:50:32 +0200
Subject: [PATCH] reduced index size and icon spacing to fit all 12 icons

---
 radio/src/bitmaps/Horus/mask_current_bg.png     | Bin 341 -> 335 bytes
 radio/src/bitmaps/Horus/mask_current_shadow.png | Bin 689 -> 559 bytes
 radio/src/gui/Horus/widgets.cpp                 |  13 ++++++++-----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/radio/src/bitmaps/Horus/mask_current_bg.png b/radio/src/bitmaps/Horus/mask_current_bg.png
index 75244f36b0d930935ec253340cf20bc127d1e5bb..715792023f36befe2d2569b5985c8c6cf002d278 100644
GIT binary patch
delta 268
zcmcc0be>7EGr-TCmrII^fq{Y7)59eQNGk!cF$Wuv{B-u#pNWdT^=CX?977^n-`?EF
z+iW1v`mp<>(7gjwxw)2o;CkbHl#7R1h&Shep1$jpXRaz%vjX<S7p2d)lU3z6Zoa$V
zL;eA4M++k1j@u58cCA~-UVHy`p-lYyCv$RVsm*6eI#+aV!*%)I%fVhB`&xfrE{XmA
z+3)tYdmI1t=G<;umg%=$F!{*7_wRalC^8uEFgtO`cL*>YE8JuBNs5KxS*6=rQBBn)
jQv$M&Zqf-q{*Y68)#a4Nt#iGA9%S%z^>bP0l+XkKsYq%p

delta 274
zcmX@lbd^c5Gr-TCmrII^fq{Y7)59eQNUH&{F$Wuv{H<2iHc`>H{*tGQV@O2n+nXCX
zTO0&hAKol|>zFJpa9TingQBtaMh@nK9z43wV+$5m9GB)l_u%h_n{PfGY?D62^X<T+
z{fyz9$J8WdC*(A3B#!YdBI4HfyQLf7S6lZze(Vz(nqlTUIlF$<>szIU=RdDEj+{2L
zeE)CF*~@;OJd;|mEmu0oYs2^Y=P!>)Y+Sdx-1d$EgT!$`!(+l)Ee(kh@7C;NXKqN1
ryih88YLiQ#NXBik&o=jCyTy-c&D^!{%<pKRHyJ!#{an^LB{Ts5``mWv

diff --git a/radio/src/bitmaps/Horus/mask_current_shadow.png b/radio/src/bitmaps/Horus/mask_current_shadow.png
index 4370002ba3527de2b60703f6662a4ab49ac7bb0b..4632c601f189a691776675d5821cb57047c81979 100644
GIT binary patch
delta 495
zcmdnUx}HU`Gr-TCmrII^fq{Y7)59eQNUH*|83!AXbhr~>Hc`>1o^g$*i(^Pc>)V_5
zt6v#N9RC=f6jiXIUf{^xvySWsUDH3Z{@~iZ(|Q-Hy6hZQbw`oH6|Mr8RMLa^@0@<Q
z`1_%kA8Nj<%(q+Wt-R;E9IN*~vj_R2Y*SMudkh)4T4tSp-tk!Cn8b?v$82uB|861I
zUvN$|J?NaJ#d8Lc7hh}p1FzIexb_BKA(jwfsCZv!HFv>Qw`r;NdNX{~R$PC*Q~G?`
z=I8Z=UeixM^}q79>S)^Lldin&hhwH}6?^?v>ROb>QiT?UgNF=i7PbgvY>k@Xw|u96
zxZd<)b9)&+|N09RHg0Rfln*YM!qN1gwQCW_-Z=gLg&b?cRzFv~n<w7u)@-Az`SkT6
z4-Ut;AHlcZik*Hc<iru8B^t6ibc)x~?caX<5IZf={QGa8Mi&Fa_S?Ks**ap}74HRE
z7=Qh>n^N_^qd(9~b4g~GMc>3_n&+My@A*C<NQuXJ%kA7Ax5e9Cm$NWDihnm@?{|+$
zEK%8S%B)p9o6<IS`YmrhnBeeB<Dc~_#?99bS$>~0Wy+_;oVLH1y4>bHe`w&c92kcT
Mp00i_>zopr0A@AZ&j0`b

delta 626
zcmZ3_vXND>Gr-TCmrII^fq{Y7)59eQNNWMH83!AX+<2XP_e4dXdL}(j7srr{#<#c5
zdp&kwX!w|~Hn+u7#A~Wh)<&^|lP@^WU!#9{GXKTJ6+%^?0``2l)-*4NmD@GPM0aLI
z!PX6@X5Hnx()!a+v0iO|%M%mjPd4WnKiNFL{_L9Zu?Z@iP8>D&kAJWAde7b}z@fP9
z<!=q&;9r03qO$w?`c_<jeImDh@xE6-f6n~;xmZtMf9Kx4sXJrV-GAYKO5$*i8S}jh
z$7am`>Gtrm{paL``=2k^Rvd8Ka>ZMjD`k9H*6ds7Hs3num`h0bpL7Q2gO@KmU%$>?
zw{BfUO^uF8<?WXxD?+sDZPIP(<u1Q1n;5ic%AwDDoIbCOoVIcI?$hVa@$GxB+)~k8
zHP3x#%(D+4Ca8FFIo96)|836GqLX*;%0^|+I;&PFvv|s{Z&nSHCkrpqSQNH;;gqUo
zHpc@WKN@b0;!XBh*w}UF!?R~>iY$R57qhlzY>jdW49Tcr&{U0j{ncd0lt~6W7o)`M
z<(}-mWb*XUqeskD1qBW=$5|Xdgg@R>ueEf2nb=v0<|*_4AHSM)^yW>;@87>?tnGX}
zBWvrgk9+@mOZzr^YkE#<IhxcM)HQv&xZ7gEy>a~~Q<|>La$D@U`|h%!l{G&DT!nwO
zy*BPKJoCJ`?XY6=!G@P5UbB|5I07x&ay!@0-`_)X`sv%P`;sTCB%00s_~FBWq>Tz)
zO5eVJzj^z%GSA`O3D*{Eh~wB0wf4j&p7WmrydtAlf8q+r+nbg8?fGnAGGg#_^>bP0
Hl+XkKL^VB%

diff --git a/radio/src/gui/Horus/widgets.cpp b/radio/src/gui/Horus/widgets.cpp
index b0db92533..3051de66d 100644
--- a/radio/src/gui/Horus/widgets.cpp
+++ b/radio/src/gui/Horus/widgets.cpp
@@ -116,7 +116,7 @@ void title(const pm_char * s)
   lcd_putsAtt(MENU_TITLE_LEFT, MENU_TITLE_TOP+2, s, MENU_TITLE_COLOR);
 }
 
-#define MENU_ICONS_SPACING 34
+#define MENU_ICONS_SPACING 31
 
 void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCount)
 {
@@ -130,12 +130,10 @@ void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCoun
   lcdDrawBitmapPattern(0, 0, LBM_TOP_POLYGON, TITLE_BGCOLOR);
 
   if (m_posVert < 0) {
-    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, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_BG, TITLE_BGCOLOR);
   }
   else {
-    lcdDrawFilledRect(58+pageIndex*MENU_ICONS_SPACING-11, 0, 36, MENU_HEADER_HEIGHT, TITLE_BGCOLOR);
+    lcdDrawFilledRect(58+pageIndex*MENU_ICONS_SPACING-9, 0, 32, MENU_HEADER_HEIGHT, TITLE_BGCOLOR);
     lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_DOT, MENU_TITLE_COLOR);
   }
 
@@ -147,6 +145,11 @@ void drawMenuTemplate(const char *name, evt_t event, int pageIndex, int pageCoun
     lcdDrawBitmapPattern(50+i*MENU_ICONS_SPACING, 7, icons[i+1], MENU_TITLE_COLOR);
   }
 
+  if (m_posVert < 0) {
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING-10, 0, LBM_CURRENT_SHADOW, TEXT_COLOR);
+    lcdDrawBitmapPattern(58+pageIndex*MENU_ICONS_SPACING, MENU_TITLE_TOP-9, LBM_CURRENT_DOT, MENU_TITLE_COLOR);
+  }
+
   if (name) {
     // header
     title(name);