diff --git a/app/ui/dialog.c b/app/ui/dialog.c index f333d26..677ea5d 100644 --- a/app/ui/dialog.c +++ b/app/ui/dialog.c @@ -209,7 +209,7 @@ app_err_t dialog_pager_colors(size_t page, size_t last_page, uint16_t bg, uint16 screen_text_ctx_t ctx = { .x = 0, - .y = SCREEN_HEIGHT - (TH_FONT_TITLE)->yAdvance, + .y = TH_NAV_PAGER_TOP, .font = TH_FONT_TITLE, .bg = bg, .fg = fg, diff --git a/app/ui/theme.h b/app/ui/theme.h index ce0f6da..044f6d7 100644 --- a/app/ui/theme.h +++ b/app/ui/theme.h @@ -104,10 +104,12 @@ #define TH_PROGRESS_LEFT_MARGIN 10 #define TH_PROGRESS_VERTICAL_MARGIN 10 -#define TH_NAV_HINT_LEFT_X 0 -#define TH_NAV_HINT_RIGHT_X (SCREEN_WIDTH - 28) -#define TH_NAV_HINT_TOP (SCREEN_HEIGHT - 28) +#define TH_NAV_HINT_LEFT_X TH_SCREEN_MARGIN +#define TH_NAV_HINT_RIGHT_X (SCREEN_WIDTH - 24 - TH_SCREEN_MARGIN) +#define TH_NAV_HINT_TOP (SCREEN_HEIGHT - TH_NAV_HINT_HEIGHT + 6) #define TH_NAV_HINT_WIDTH 40 #define TH_NAV_HINT_HEIGHT 44 +#define TH_NAV_PAGER_TOP (SCREEN_HEIGHT - TH_NAV_HINT_HEIGHT + 8) + #endif