font property moved to widget base

1 files changed, 2 insertions, 15 deletions

diff --git a/fw/fe310/eos/app/root.h b/fw/fe310/eos/app/root.h
index 69624e7..9468e6e 100644
--- a/fw/fe310/eos/app/root.h
+++ b/fw/fe310/eos/app/root.h
@@ -6,24 +6,11 @@
 
 #define APP_FONT_HANDLE     31
 
-typedef struct APPLabelSpec {
-    EVERect g;
-    EVEFont *font;
-    char *title;
-} APPLabelSpec;
-
-typedef struct APPWidgetSpec {
-    APPLabelSpec label;
-    struct {
-        EVERect g;
-        EVEWidgetSpec spec;
-        uint8_t type;
-    } widget;
-} APPWidgetSpec;
+#define APP_LABEL_MARGIN    10
 
 EVEScreen *app_screen(void);
 void app_screen_init(eve_view_constructor_t home_page);
 void app_screen_refresh(void);
 
-EVEForm *app_form_create(EVEWindow *window, EVEViewStack *stack, APPWidgetSpec spec[], uint16_t spec_size, eve_form_action_t action, eve_form_destructor_t destructor);
+EVEForm *app_form_create(EVEWindow *window, EVEViewStack *stack, EVEWidgetSpec spec[], uint16_t spec_size, eve_form_action_t action, eve_form_destructor_t destructor);
 void app_form_destroy(EVEForm *form);