feat(color): adjust top bar widget sizes (#4846)

This commit is contained in:
philmoz
2024-04-08 08:31:17 +10:00
committed by GitHub
parent c16f6ad59f
commit 18dbca3f5f
3 changed files with 5 additions and 3 deletions
@@ -40,10 +40,12 @@ unsigned int TopBar::getZonesCount() const
rect_t TopBar::getZone(unsigned int index) const rect_t TopBar::getZone(unsigned int index) const
{ {
#if LCD_H > LCD_W
if (index == MAX_TOPBAR_ZONES - 1) { if (index == MAX_TOPBAR_ZONES - 1) {
coord_t size = LCD_W - 48 - (MAX_TOPBAR_ZONES - 1) * (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN); 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}; return {LCD_W - size, TOPBAR_ZONE_VMARGIN, size, TOPBAR_ZONE_HEIGHT};
} }
#endif
return { return {
coord_t(48 + (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN) * index), coord_t(48 + (TOPBAR_ZONE_WIDTH + TOPBAR_ZONE_HMARGIN) * index),
+1 -1
View File
@@ -25,7 +25,7 @@
constexpr coord_t TOPBAR_ZONE_WIDTH = 70; constexpr coord_t TOPBAR_ZONE_WIDTH = 70;
constexpr coord_t TOPBAR_ZONE_VMARGIN = 3; 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; constexpr coord_t TOPBAR_ZONE_HEIGHT = MENU_HEADER_HEIGHT - 2 * TOPBAR_ZONE_VMARGIN;
class ScreenMenu; class ScreenMenu;
@@ -199,9 +199,9 @@ BaseWidgetFactory<RadioInfoWidget> RadioInfoWidget("Radio Info", nullptr,
// Adjustment to make main view date/time align with model/radio settings views // Adjustment to make main view date/time align with model/radio settings views
#if LCD_W > LCD_H #if LCD_W > LCD_H
#define DT_OFFSET 19 #define DT_OFFSET 24
#else #else
#define DT_OFFSET 5 #define DT_OFFSET 8
#endif #endif
class DateTimeWidget : public TopBarWidget class DateTimeWidget : public TopBarWidget