From 18dbca3f5f6c27326ac8bd33dfc5372ce7f9e540 Mon Sep 17 00:00:00 2001 From: philmoz Date: Mon, 8 Apr 2024 08:31:17 +1000 Subject: [PATCH] feat(color): adjust top bar widget sizes (#4846) --- radio/src/gui/colorlcd/layouts/topbar_impl.cpp | 2 ++ radio/src/gui/colorlcd/topbar.h | 2 +- radio/src/gui/colorlcd/widgets/radio_info.cpp | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp index 8e6e49583..f43bfbc19 100644 --- a/radio/src/gui/colorlcd/layouts/topbar_impl.cpp +++ b/radio/src/gui/colorlcd/layouts/topbar_impl.cpp @@ -40,10 +40,12 @@ unsigned int TopBar::getZonesCount() const rect_t TopBar::getZone(unsigned int index) const { +#if LCD_H > LCD_W if (index == MAX_TOPBAR_ZONES - 1) { coord_t size = LCD_W - 48 - (MAX_TOPBAR_ZONES - 1) * (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN); return {LCD_W - size, TOPBAR_ZONE_VMARGIN, size, TOPBAR_ZONE_HEIGHT}; } +#endif return { coord_t(48 + (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN) * index), diff --git a/radio/src/gui/colorlcd/topbar.h b/radio/src/gui/colorlcd/topbar.h index 521070462..c703ea345 100644 --- a/radio/src/gui/colorlcd/topbar.h +++ b/radio/src/gui/colorlcd/topbar.h @@ -25,7 +25,7 @@ constexpr coord_t TOPBAR_ZONE_WIDTH = 70; constexpr coord_t TOPBAR_ZONE_VMARGIN = 3; -constexpr coord_t TOPBAR_ZONE_HMARGIN = 3; +constexpr coord_t TOPBAR_ZONE_HMARGIN = 2; constexpr coord_t TOPBAR_ZONE_HEIGHT = MENU_HEADER_HEIGHT - 2 * TOPBAR_ZONE_VMARGIN; class ScreenMenu; diff --git a/radio/src/gui/colorlcd/widgets/radio_info.cpp b/radio/src/gui/colorlcd/widgets/radio_info.cpp index e59658368..4a576ee80 100644 --- a/radio/src/gui/colorlcd/widgets/radio_info.cpp +++ b/radio/src/gui/colorlcd/widgets/radio_info.cpp @@ -199,9 +199,9 @@ BaseWidgetFactory RadioInfoWidget("Radio Info", nullptr, // Adjustment to make main view date/time align with model/radio settings views #if LCD_W > LCD_H -#define DT_OFFSET 19 +#define DT_OFFSET 24 #else -#define DT_OFFSET 5 +#define DT_OFFSET 8 #endif class DateTimeWidget : public TopBarWidget