Skip to content

Commit 9d5639a

Browse files
author
philmoz
committed
Fix some more layout settings.
1 parent c408629 commit 9d5639a

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class ListLineButton : public ButtonBase
3737

3838
virtual void refresh() = 0;
3939

40-
static constexpr coord_t BTN_H = EdgeTxStyles::STD_FONT_HEIGHT + PAD_BORDER * 2 + PAD_TINY * 2;
40+
static constexpr coord_t BTN_H = EdgeTxStyles::STD_FONT_HEIGHT + PAD_BORDER * 2 + PAD_OUTLINE * 2;
4141
static constexpr coord_t GRP_W = LCD_W - PAD_SMALL * 2;
4242

4343
protected:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class PageHeader : public Window
3737
StaticText* setTitle2(std::string txt);
3838

3939
static LAYOUT_VAL(PAGE_TITLE_LEFT, 50, 50, LS(50))
40-
static constexpr coord_t PAGE_TITLE_TOP = 2;
40+
static constexpr coord_t PAGE_TITLE_TOP = PAD_TINY;
4141

4242
protected:
4343
StaticText* title;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class TabsGroup : public NavWindow
8888
void onCancel() override;
8989

9090
static LAYOUT_VAL(MENU_TITLE_TOP, 48, 48, LS(48))
91-
static LAYOUT_VAL(MENU_TITLE_HEIGHT, 21, 21, LS(21))
91+
static constexpr coord_t MENU_TITLE_HEIGHT = EdgeTxStyles::STD_FONT_HEIGHT;
9292
static constexpr coord_t MENU_BODY_TOP = MENU_TITLE_TOP + MENU_TITLE_HEIGHT;
9393
static constexpr coord_t MENU_BODY_HEIGHT = LCD_H - MENU_BODY_TOP;
9494

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ void ModelFlightModesPage::build(Window* form)
493493

494494
for (int i = 0; i < MAX_FLIGHT_MODES; i++) {
495495
auto btn = new FlightModeBtn(form, i);
496-
lv_obj_set_pos(btn->getLvObj(), PAD_SMALL, i * (FlightModeBtn::BTN_H + 3) + 4);
496+
lv_obj_set_pos(btn->getLvObj(), PAD_SMALL, i * (FlightModeBtn::BTN_H + PAD_THREE) + PAD_SMALL);
497497
btn->setWidth(ListLineButton::GRP_W);
498498

499499
btn->setPressHandler([=]() {
@@ -503,7 +503,7 @@ void ModelFlightModesPage::build(Window* form)
503503
}
504504

505505
trimCheck = new TextButton(
506-
form, rect_t{6, MAX_FLIGHT_MODES * (FlightModeBtn::BTN_H + 3) + PAD_LARGE, ListLineButton::GRP_W, TRIM_CHK_H}, STR_CHECKTRIMS, [&]() -> uint8_t {
506+
form, rect_t{6, MAX_FLIGHT_MODES * (FlightModeBtn::BTN_H + PAD_THREE) + PAD_LARGE, ListLineButton::GRP_W, TRIM_CHK_H}, STR_CHECKTRIMS, [&]() -> uint8_t {
507507
if (trimsCheckTimer)
508508
trimsCheckTimer = 0;
509509
else

0 commit comments

Comments
 (0)