From 424daa752c8f69d184b2d57af5820a164f8b2ae2 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Thu, 29 Nov 2012 06:43:17 +0000
Subject: [PATCH] [X9D] Positions and sizes adjustements

---
 src/main_views.cpp  |  2 +-
 src/menus.cpp       | 18 +++++++++++++-----
 src/model_menus.cpp |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main_views.cpp b/src/main_views.cpp
index e2d96aa97..73aae5e50 100644
--- a/src/main_views.cpp
+++ b/src/main_views.cpp
@@ -40,7 +40,7 @@
 #define RBOX_CENTERX  (DISPLAY_W-LBOX_CENTERX)
 #define RBOX_CENTERY  LBOX_CENTERY
 #define MODELNAME_X   (13)
-#define VBATT_X       (MODELNAME_X+28)
+#define VBATT_X       (MODELNAME_X+26)
 #define VBATT_Y       (FH+3)
 #define VBATTUNIT_X   (VBATT_X-2)
 #define VBATTUNIT_Y   VBATT_Y
diff --git a/src/menus.cpp b/src/menus.cpp
index 4dc88aa5a..9de552a90 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -724,6 +724,14 @@ int8_t gvarMenuItem(uint8_t x, uint8_t y, int8_t value, int8_t min, int8_t max,
 }
 #endif
 
+#if defined(LCD212)
+#define MENU_X   30
+#define MENU_W   DISPLAY_W-60
+#else
+#define MENU_X   10
+#define MENU_W   DISPLAY_W-20
+#endif
+
 #if defined(SDCARD)
 const char *s_menu[MENU_MAX_LINES];
 uint8_t s_menu_item = 0;
@@ -736,16 +744,16 @@ const char * displayMenu(uint8_t event)
 
   uint8_t display_count = min(s_menu_count, (uint16_t)MENU_MAX_LINES);
 
-  lcd_filled_rect(10, 16, DISPLAY_W-20, display_count * (FH+1) + 2, SOLID, WHITE);
-  lcd_rect(10, 16, DISPLAY_W-20, display_count * (FH+1) + 2);
+  lcd_filled_rect(MENU_X, 16, MENU_W, display_count * (FH+1) + 2, SOLID, WHITE);
+  lcd_rect(MENU_X, 16, MENU_W, display_count * (FH+1) + 2);
 
   for (uint8_t i=0; i<display_count; i++) {
-    lcd_putsAtt(16, i*(FH+1) + 2*FH + 2, s_menu[i], s_menu_flags);
-    if (i == s_menu_item) lcd_filled_rect(11, i*(FH+1) + 2*FH + 1, DISPLAY_W-22, 9);
+    lcd_putsAtt(MENU_X+6, i*(FH+1) + 2*FH + 2, s_menu[i], s_menu_flags);
+    if (i == s_menu_item) lcd_filled_rect(MENU_X+1, i*(FH+1) + 2*FH + 1, MENU_W-2, 9);
   }
 
   if (s_menu_count > display_count) {
-    displayScrollbar(DISPLAY_W-11, 17, MENU_MAX_LINES * (FH+1), s_menu_offset, s_menu_count, MENU_MAX_LINES);
+    displayScrollbar(MENU_W-1, 17, MENU_MAX_LINES * (FH+1), s_menu_offset, s_menu_count, MENU_MAX_LINES);
   }
 
   switch(event) {
diff --git a/src/model_menus.cpp b/src/model_menus.cpp
index 25e6a220d..bcd31ac04 100644
--- a/src/model_menus.cpp
+++ b/src/model_menus.cpp
@@ -634,7 +634,7 @@ void menuModelSetup(uint8_t event)
     s_rangecheck_mode = 0;
 #endif
 
-  MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),FIELD_TIMER_MAX,FIELD_TIMER_MAX,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
+  MENU(STR_MENUSETUP, menuTabModel, e_Model, ((protocol<=PROTO_PPMSIM||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 14 : 13), {0,ZCHAR|(sizeof(g_model.name)-1),IF_PCBX9D(0) FIELD_TIMER_MAX,FIELD_TIMER_MAX,0,0,0,0,0,0,0,NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1,1,2});
 
   uint8_t  sub = m_posVert - 1;
   int8_t editMode = s_editMode;