From 97c94f910187e59eba086d8a86c8cdda77a70663 Mon Sep 17 00:00:00 2001 From: olliw42 Date: Mon, 17 May 2021 00:45:12 +0200 Subject: [PATCH] system hardware menu, aligned it really looks much better --- radio/src/gui/colorlcd/radio_hardware.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/radio/src/gui/colorlcd/radio_hardware.cpp b/radio/src/gui/colorlcd/radio_hardware.cpp index f2932f9a3..7e1c353ae 100644 --- a/radio/src/gui/colorlcd/radio_hardware.cpp +++ b/radio/src/gui/colorlcd/radio_hardware.cpp @@ -152,9 +152,9 @@ void RadioHardwarePage::build(FormWindow * window) { FormGridLayout grid; #if LCD_W > LCD_H - grid.setLabelWidth(130); + grid.setLabelWidth(180); #else - grid.setLabelWidth(100); + grid.setLabelWidth(130); #endif grid.spacer(6); @@ -233,15 +233,10 @@ void RadioHardwarePage::build(FormWindow * window) }); grid.nextLine(); } -#if LCD_W > LCD_H - grid.setLabelWidth(180); -#else - grid.setLabelWidth(130); -#endif // Bat calibration new StaticText(window, grid.getLabelSlot(), STR_BATT_CALIB); - auto batCal = new NumberEdit(window, grid.getFieldSlot(), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration)); + auto batCal = new NumberEdit(window, grid.getFieldSlot(1,0), -127, 127, GET_SET_DEFAULT(g_eeGeneral.txVoltageCalibration)); batCal->setDisplayHandler([](BitmapBuffer * dc, LcdFlags flags, int32_t value) { dc->drawNumber(FIELD_PADDING_LEFT, FIELD_PADDING_TOP, getBatteryVoltage(), flags | PREC2, 0, nullptr, "V"); }); @@ -250,14 +245,14 @@ void RadioHardwarePage::build(FormWindow * window) // RTC Batt display new StaticText(window, grid.getLabelSlot(), STR_RTC_BATT); - new DynamicNumber(window, grid.getFieldSlot(), [] { + new DynamicNumber(window, grid.getFieldSlot(1,0), [] { return getRTCBatteryVoltage(); }, PREC2, nullptr, "V"); grid.nextLine(); // RTC Batt check enable new StaticText(window, grid.getLabelSlot(), STR_RTC_CHECK); - new CheckBox(window, grid.getFieldSlot(), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning )); + new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.disableRtcWarning )); grid.nextLine(); #if defined(CROSSFIRE) && SPORT_MAX_BAUDRATE < 400000 @@ -301,7 +296,7 @@ void RadioHardwarePage::build(FormWindow * window) // ADC filter new StaticText(window, grid.getLabelSlot(), STR_JITTER_FILTER); - new CheckBox(window, grid.getFieldSlot(), GET_SET_INVERTED(g_eeGeneral.jitterFilter)); + new CheckBox(window, grid.getFieldSlot(1,0), GET_SET_INVERTED(g_eeGeneral.jitterFilter)); grid.nextLine(); // Debugs