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/wifi.c | |
parent | 6a4c8a1f11f6a7bd57b0fd618f455bcdecbfe538 (diff) |
font property moved to widget base
Diffstat (limited to 'fw/fe310/test/wifi.c')
-rw-r--r-- | fw/fe310/test/wifi.c | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/fw/fe310/test/wifi.c b/fw/fe310/test/wifi.c index 5306d37..f7ca24d 100644 --- a/fw/fe310/test/wifi.c +++ b/fw/fe310/test/wifi.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> @@ -28,8 +29,6 @@ #include "status.h" #include "wifi.h" -extern EVEFont *_app_font_default; - static void wifi_scan(void) { unsigned char *buffer = eos_net_alloc(); buffer[0] = EOS_WIFI_MTYPE_SCAN; @@ -82,17 +81,13 @@ static void wifi_disconnect_handler(unsigned char type, unsigned char *buffer, u } void app_wifi(EVEWindow *window, EVEViewStack *stack) { - char *title = "Password:"; - uint16_t w = eve_font_str_w(_app_font_default, title) + 10; - APPWidgetSpec spec[] = { + EVEWidgetSpec spec[] = { { .label.g.w = APP_SCREEN_W, - .label.font = _app_font_default, .label.title = "Select network:", .widget.type = EVE_WIDGET_TYPE_SELECT, .widget.g.w = APP_SCREEN_W, - .widget.spec.select.font = _app_font_default, .widget.spec.select.option_size = 1500, }, { @@ -101,13 +96,9 @@ void app_wifi(EVEWindow *window, EVEViewStack *stack) { .widget.g.h = 50, }, { - .label.g.w = w, - .label.font = _app_font_default, - .label.title = title, + .label.title = "Password:", .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, }, }; |