From 82a6206422ed658a99716fbd18e33942cebc833b Mon Sep 17 00:00:00 2001 From: Uros Majstorovic Date: Sun, 28 Feb 2021 21:00:13 +0100 Subject: font property moved to widget base --- fw/fe310/test/phone.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'fw/fe310/test/phone.c') diff --git a/fw/fe310/test/phone.c b/fw/fe310/test/phone.c index 2832fc4..b3a08b1 100644 --- a/fw/fe310/test/phone.c +++ b/fw/fe310/test/phone.c @@ -14,6 +14,7 @@ #include #include +#include #include #include @@ -28,8 +29,6 @@ #include "status.h" #include "phone.h" -extern EVEFont *_app_font_default; - #define ABUF_SIZE 512 #define MIC_WM 128 @@ -88,17 +87,11 @@ static void cell_voice_handler(unsigned char type, unsigned char *buffer, uint16 } void app_phone(EVEWindow *window, EVEViewStack *stack) { - char *title = "Phone:"; - uint16_t w = eve_font_str_w(_app_font_default, title) + 10; - APPWidgetSpec spec[] = { + EVEWidgetSpec spec[] = { { - .label.g.w = w, - .label.font = _app_font_default, - .label.title = title, + .label.title = "Phone:", .widget.type = EVE_WIDGET_TYPE_STR, - .widget.g.w = APP_SCREEN_W - w, - .widget.spec.str.font = _app_font_default, .widget.spec.str.str_size = 128, }, }; -- cgit v1.2.3