Merge with latest libopenui changes

radio/src/gui/colorlcd/model_gvars.cpp

@@ -354,7 +354,7 @@ void ModelGVarsPage::build(FormWindow * window)
         return 0;
     });
 
-    grid.nextLine(button->getHeight());
+    grid.nextLine(button->height());
   }
   window->setInnerHeight(grid.getWindowHeight());
 }

radio/src/gui/colorlcd/model_inputs.cpp

@@ -328,7 +328,7 @@ class InputLineButton : public CommonInputOrMixButton {
     {
       const ExpoData & line = g_model.expoData[index];
       if (line.swtch || line.curve.value != 0 || line.flightModes) {
-        setHeight(getHeight() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT);
       }
     }
 

radio/src/gui/colorlcd/model_logical_switches.cpp

@@ -241,9 +241,9 @@ class LogicalSwitchButton : public Button {
     {
       LogicalSwitchData * ls = lswAddress(lsIndex);
       if (ls->andsw != SWSRC_NONE || ls->duration != 0 || ls->delay != 0)
-        setHeight(getHeight() + 20);
+        setHeight(height() + 20);
       if (lswFamily(ls->func) == LS_FAMILY_EDGE)
-        setHeight(getHeight() + 20);
+        setHeight(height() + 20);
     }
 
     bool isActive()

radio/src/gui/colorlcd/model_mixes.cpp

@@ -233,7 +233,7 @@ class MixLineButton : public CommonInputOrMixButton {
     {
       const MixData & mix = g_model.mixData[index];
       if (mix.swtch || mix.curve.value != 0 || mix.flightModes) {
-        setHeight(getHeight() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT);
       }
     }
 

radio/src/gui/colorlcd/model_outputs.cpp

@@ -114,7 +114,7 @@ class OutputLineButton : public Button {
       output(output)
     {
       if (output->revert || output->curve || output->name[0]) {
-        setHeight(getHeight() + PAGE_LINE_HEIGHT);
+        setHeight(height() + PAGE_LINE_HEIGHT);
       }
     }
 

radio/src/gui/colorlcd/radio_trainer.cpp

@@ -64,12 +64,10 @@ void RadioTrainerPage::build(FormWindow * window)
   new StaticText(window, grid.getLabelSlot(), STR_CAL);
   for (int i = 0; i < NUM_STICKS; i++) {
 #if defined (PPM_UNIT_PERCENT_PREC1)
-    auto calib = new NumberEdit(window, grid.getFieldSlot(4, i), 0 , 0, [=]() { return (ppmInput[i]-g_eeGeneral.trainer.calib[i]) * 2; }, nullptr, LEFT|PREC1);
+    auto calib = new NumberEdit(window, grid.getFieldSlot(4, i), 0 , 0, [=]() { return (ppmInput[i]-g_eeGeneral.trainer.calib[i]) * 2; }, nullptr, LEFT | PREC1);
 #else
     auto calib = new NumberEdit(window, grid.getFieldSlot(4, i), 0 , 0, [=]() { return (ppmInput[i]-g_eeGeneral.trainer.calib[i]) / 5; }, nullptr, LEFT);
 #endif
     calib->setWindowFlags(REFRESH_ALWAYS);
-
-    FormField::link(multiplier, window->getFirstField());
   }
 }

radio/src/gui/colorlcd/radio_version.cpp

@@ -33,7 +33,7 @@ class OptionsText : public StaticText {
         const char * option = options[i];
         optionWidth += getTextWidth(option);
         if (optionWidth + 5 > width()) {
-          setHeight(getHeight() + 20);
+          setHeight(height() + 20);
           optionWidth = 0;
         }
       }

radio/src/gui/colorlcd/special_functions.cpp

@@ -253,7 +253,7 @@ class SpecialFunctionButton : public Button {
       uint8_t func = CFN_FUNC(cfn);
       if (!cfn->isEmpty() &&
           (HAS_ENABLE_PARAM(func) || HAS_REPEAT_PARAM(func) || (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT))) {
-        setHeight(getHeight() + 20);
+        setHeight(height() + 20);
       }
     }