diff options
author | Uros Majstorovic <majstor@majstor.org> | 2021-02-28 21:00:13 +0100 |
---|---|---|
committer | Uros Majstorovic <majstor@majstor.org> | 2021-02-28 21:00:13 +0100 |
commit | 82a6206422ed658a99716fbd18e33942cebc833b (patch) | |
tree | f849699cd7a31175c57c3d9583d2162786138e3c /fw/fe310/test/main.c | |
parent | 6a4c8a1f11f6a7bd57b0fd618f455bcdecbfe538 (diff) |
font property moved to widget base
Diffstat (limited to 'fw/fe310/test/main.c')
-rw-r--r-- | fw/fe310/test/main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/fw/fe310/test/main.c b/fw/fe310/test/main.c index 7516fe8..934995c 100644 --- a/fw/fe310/test/main.c +++ b/fw/fe310/test/main.c @@ -14,6 +14,7 @@ #include <eve/eve.h> #include <eve/eve_kbd.h> +#include <eve/eve_font.h> #include <eve/screen/screen.h> #include <eve/screen/window.h> @@ -32,35 +33,29 @@ #include "modem.h" #include "wifi.h" -extern EVEFont *_app_font_default; - void app_home_page(EVEWindow *window, EVEViewStack *stack) { - APPWidgetSpec spec[] = { + EVEWidgetSpec spec[] = { { .widget.type = EVE_WIDGET_TYPE_PAGE, .widget.g.w = APP_SCREEN_W, - .widget.spec.page.font = _app_font_default, .widget.spec.page.title = "Phone", .widget.spec.page.constructor = app_phone }, { .widget.type = EVE_WIDGET_TYPE_PAGE, .widget.g.w = APP_SCREEN_W, - .widget.spec.page.font = _app_font_default, .widget.spec.page.title = "WiFi", .widget.spec.page.constructor = app_wifi }, { .widget.type = EVE_WIDGET_TYPE_PAGE, .widget.g.w = APP_SCREEN_W, - .widget.spec.page.font = _app_font_default, .widget.spec.page.title = "Cellular data", .widget.spec.page.constructor = app_cell_pdp }, { .widget.type = EVE_WIDGET_TYPE_PAGE, .widget.g.w = APP_SCREEN_W, - .widget.spec.page.font = _app_font_default, .widget.spec.page.title = "Modem", .widget.spec.page.constructor = app_modem }, |