Skip to content

Commit

Permalink
Fix rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
philmoz committed Apr 8, 2024
1 parent ba3fb3c commit 88e5605
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/topbar.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include "layout.h"

LAYOUT_VAL3(TOPBAR_ZONE_WIDTH, 70, 48, 70)
LAYOUT_VAL3(TOPBAR_ZONE_WIDTH, 70, 47, 70)
LAYOUT_VAL1(TOPBAR_ZONE_VMARGIN, 3)
LAYOUT_VAL1(TOPBAR_ZONE_HMARGIN, 2)
constexpr coord_t TOPBAR_ZONE_HEIGHT = MENU_HEADER_HEIGHT - 2 * TOPBAR_ZONE_VMARGIN;
Expand Down
2 changes: 1 addition & 1 deletion radio/src/gui/colorlcd/widgets/radio_info.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ BaseWidgetFactory<RadioInfoWidget> RadioInfoWidget("Radio Info", nullptr,
"Radio Info");

// Adjustment to make main view date/time align with model/radio settings views
LAYOUT_VAL3(DT_X, 24, 6, 8)
LAYOUT_VAL2(DT_X, 24, 8)
LAYOUT_VAL1(DT_Y, 3)

class DateTimeWidget : public TopBarWidget
Expand Down

0 comments on commit 88e5605

Please sign in to comment.