Fix analog diag page layout. Fix customisable switch edit page layout.

Author: philmoz

radio/src/gui/colorlcd/model/function_switches.cpp

@@ -169,30 +169,29 @@ class FunctionSwitch : public Window
   }
 
 #if defined(FUNCTION_SWITCHES_RGB_LEDS)
-  static constexpr coord_t SW_X = PAD_SMALL;
-  static constexpr coord_t SW_W = 70;
-  static constexpr coord_t NM_X = SW_X + SW_W;
-  static constexpr coord_t NM_W = 60;
+  static LAYOUT_VAL(SW_W, 70, 70, LS(70))
+  static constexpr coord_t NM_X = SW_W + PAD_SMALL;
+  static LAYOUT_VAL(NM_W, 60, 60, LS(60))
   static constexpr coord_t TP_X = NM_X + NM_W + PAD_SMALL;
-  static constexpr coord_t TP_W = 78;
+  static LAYOUT_VAL(TP_W, 78, 78, LS(78))
   static constexpr coord_t GR_X = TP_X + TP_W + PAD_SMALL;
-  static constexpr coord_t GR_W = 84;
+  static LAYOUT_VAL(GR_W, 84, 84, LS(84))
   static constexpr coord_t ST_X = GR_X + GR_W + PAD_SMALL;
-  static constexpr coord_t ST_W = 60;
+  static LAYOUT_VAL(ST_W, 60, 60, LS(60))
   static constexpr coord_t C1_X = ST_X + ST_W + PAD_SMALL;
-  static constexpr coord_t C1_W = 40;
+  static LAYOUT_VAL(C1_W, 40, 40, LS(40))
   static constexpr coord_t C2_X = C1_X + C1_W + PAD_SMALL;
-  static constexpr coord_t C2_W = 40;
+  static LAYOUT_VAL(C2_W, 40, 40, LS(40))
 #else
   static constexpr coord_t SW_W = (LCD_W - PAD_SMALL * 2 - PAD_TINY * 4) / 5;
   static constexpr coord_t NM_X = SW_W + PAD_TINY;
-  static constexpr coord_t NM_W = 80;
+  static LAYOUT_VAL(NM_W, 80, 80, LS(80))
   static constexpr coord_t TP_X = NM_X + SW_W + PAD_TINY;
-  static constexpr coord_t TP_W = 86;
+  static LAYOUT_VAL(TP_W, 86, 86, LS(86))
   static constexpr coord_t GR_X = TP_X + SW_W + PAD_TINY;
-  static constexpr coord_t GR_W = 94;
-  static constexpr coord_t ST_X = GR_X + SW_W + 20;
-  static constexpr coord_t ST_W = 70;
+  static LAYOUT_VAL(GR_W, 94, 94, LS(94))
+  static constexpr coord_t ST_X = GR_X + SW_W + PAD_LARGE * 2 + PAD_SMALL;
+  static LAYOUT_VAL(ST_W, 70, 70, LS(70))
 #endif
 
  protected:
@@ -295,13 +294,13 @@ class SwitchGroup : public Window
     startChoice->setValue(groupDefaultSwitch(groupIndex) + 1);
   }
 
-  static constexpr coord_t NM_W = 100;
-  static constexpr coord_t AO_X = NM_W + 2;
-  static constexpr coord_t AO_W = 100;
-  static constexpr coord_t SL_X = AO_X + AO_W + 30;
-  static constexpr coord_t SL_W = 100;
-  static constexpr coord_t ST_X = SL_X + SL_W + 2;
-  static constexpr coord_t ST_W = 80;
+  static LAYOUT_VAL(NM_W, 100, 100, LS(100))
+  static constexpr coord_t AO_X = NM_W + PAD_TINY;
+  static LAYOUT_VAL(AO_W, 100, 100, LS(100))
+  static constexpr coord_t SL_X = AO_X + AO_W + PAD_LARGE * 3 + PAD_MEDIUM;
+  static LAYOUT_VAL(SL_W, 100, 100, LS(100))
+  static constexpr coord_t ST_X = SL_X + SL_W + PAD_TINY;
+  static LAYOUT_VAL(ST_W, 80, 80, LS(80))
 
  protected:
   uint8_t groupIndex;

radio/src/gui/colorlcd/radio/radio_diaganas.cpp

@@ -35,9 +35,10 @@
 #if !PORTRAIT_LCD
 
 static const lv_coord_t col_dsc[] = {
-    LV_GRID_FR(30), LV_GRID_FR(30), LV_GRID_FR(40),       LV_GRID_FR(40),
-    LV_GRID_FR(40), LV_GRID_FR(30), LV_GRID_FR(30),       LV_GRID_FR(40),
-    LV_GRID_FR(40), LV_GRID_FR(40), LV_GRID_TEMPLATE_LAST};
+  LV_GRID_FR(32), LV_GRID_FR(40), LV_GRID_FR(40), LV_GRID_FR(40), LV_GRID_FR(40),
+  LV_GRID_FR(32), LV_GRID_FR(40), LV_GRID_FR(40), LV_GRID_FR(40), LV_GRID_FR(40),
+  LV_GRID_TEMPLATE_LAST
+};
 
 #else