From 82a6206422ed658a99716fbd18e33942cebc833b Mon Sep 17 00:00:00 2001
From: Uros Majstorovic <majstor@majstor.org>
Date: Sun, 28 Feb 2021 21:00:13 +0100
Subject: font property moved to widget base

---
 fw/fe310/test/cell_pdp.c | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'fw/fe310/test/cell_pdp.c')

diff --git a/fw/fe310/test/cell_pdp.c b/fw/fe310/test/cell_pdp.c
index 955b42e..43c8579 100644
--- a/fw/fe310/test/cell_pdp.c
+++ b/fw/fe310/test/cell_pdp.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 "cell_pdp.h"
 
-extern EVEFont *_app_font_default;
-
 static void cell_pdp_connect(char *apn, char *user, char *pass) {
     unsigned char *buffer, *p;
 
@@ -72,35 +71,26 @@ static void cell_pdp_handler(unsigned char type, unsigned char *buffer, uint16_t
 }
 
 void app_cell_pdp(EVEWindow *window, EVEViewStack *stack) {
-    APPWidgetSpec spec[] = {
+    EVEWidgetSpec spec[] = {
         {
             .label.g.w = APP_SCREEN_W / 3,
-            .label.font = _app_font_default,
             .label.title = "APN:",
 
             .widget.type = EVE_WIDGET_TYPE_STR,
-            .widget.g.w = APP_SCREEN_W - APP_SCREEN_W / 3,
-            .widget.spec.str.font = _app_font_default,
             .widget.spec.str.str_size = 128,
         },
         {
             .label.g.w = APP_SCREEN_W / 3,
-            .label.font = _app_font_default,
             .label.title = "User:",
 
             .widget.type = EVE_WIDGET_TYPE_STR,
-            .widget.g.w = APP_SCREEN_W - APP_SCREEN_W / 3,
-            .widget.spec.str.font = _app_font_default,
             .widget.spec.str.str_size = 128,
         },
         {
             .label.g.w = APP_SCREEN_W / 3,
-            .label.font = _app_font_default,
             .label.title = "Pass:",
 
             .widget.type = EVE_WIDGET_TYPE_STR,
-            .widget.g.w = APP_SCREEN_W - APP_SCREEN_W / 3,
-            .widget.spec.str.font = _app_font_default,
             .widget.spec.str.str_size = 128,
         },
     };
-- 
cgit v1.2.3