piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/layouts/topbar_impl.cpp
+2
View File
@@ -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),
radio/src/gui/colorlcd/topbar.h
+1 -1
View File
@@ -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;
radio/src/gui/colorlcd/widgets/radio_info.cpp
+2 -2
View File
@@ -199,9 +199,9 @@ BaseWidgetFactory<RadioInfoWidget> 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