Fix layout

Author: philmoz

radio/src/gui/colorlcd/libui/page.h

@@ -89,7 +89,7 @@ class SubPage : public Page
 
   Window* setupLine(const char* title, std::function<void(Window*, coord_t, coord_t)> createEdit, coord_t lblYOffset = 0);
 
-  static LAYOUT_ORIENTATION(EDT_X, LCD_W * 9 / 20, LCD_W * 8 / 20)
+  static LAYOUT_SIZE(EDT_X, LCD_W * 9 / 20, LCD_W * 8 / 20)
 
  protected:
   coord_t y = 0;

radio/src/gui/colorlcd/radio/radio_setup.cpp

@@ -194,7 +194,7 @@ class ControlTextOverride : public StaticText
 {
  public:
   ControlTextOverride(Window* parent, coord_t x, coord_t y, FunctionsActive func) :
-        StaticText(parent, {x, y + PAD_MEDIUM, 0, 0}, STR_SF_OVERRIDDEN, COLOR_THEME_WARNING_INDEX, FONT_SZ), func(func)
+        StaticText(parent, {x + XO, y + PAD_MEDIUM, 0, 0}, STR_SF_OVERRIDDEN, COLOR_THEME_WARNING_INDEX, FONT_SZ), func(func)
   {
   }
 
@@ -203,7 +203,8 @@ class ControlTextOverride : public StaticText
     show(isFunctionActive(func));
   }
 
-  static LAYOUT_ORIENTATION(FONT_SZ, FONT(STD), FONT(XS))
+  static LAYOUT_SIZE(FONT_SZ, FONT(STD), FONT(XS))
+  static LAYOUT_ORIENTATION(XO, PAD_LARGE * 12, PAD_LARGE * 8)
 
  protected:
   FunctionsActive func;
@@ -282,7 +283,7 @@ static SetupLineDef soundPageSetupLines[] = {
       auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
               GET_SET_DEFAULT(g_eeGeneral.volumeSrc), true);
       choice->setAvailableHandler(isSourceSwitchOrPotAvailable);
-      new ControlTextOverride(parent, x + PAD_LARGE * 7, y, FUNCTION_VOLUME);
+      new ControlTextOverride(parent, x, y, FUNCTION_VOLUME);
       }
   },
 };
@@ -520,7 +521,7 @@ class BacklightPage : public SubPage
           auto choice = new SourceChoice(parent, {x, y, 0, 0}, MIXSRC_NONE, MIXSRC_LAST_SWITCH,
                   GET_SET_DEFAULT(g_eeGeneral.backlightSrc), true);
           choice->setAvailableHandler(isSourceSwitchOrPotAvailable);
-          new ControlTextOverride(parent, x + PAD_LARGE * 7, y, FUNCTION_BACKLIGHT);
+          new ControlTextOverride(parent, x, y, FUNCTION_BACKLIGHT);
         });
 
     // Flash beep