1 files changed, 24 insertions, 22 deletions

diff --git a/fw/fe310/eos/eve/widget/pagew.c b/fw/fe310/eos/eve/widget/pagew.c
index 6754338..4f59d2e 100644
--- a/fw/fe310/eos/eve/widget/pagew.c
+++ b/fw/fe310/eos/eve/widget/pagew.c
@@ -1,8 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "unicode.h"
-
 #include "eve.h"
 #include "eve_kbd.h"
 #include "eve_font.h"
@@ -14,40 +12,32 @@
 #include "widget.h"
 #include "pagew.h"
 
-int eve_pagew_create(EVEPageWidget *widget, EVERect *g, EVEFont *font, EVEPageSpec *spec) {
-    eve_pagew_init(widget, g, font, spec->title, spec->constructor);
+int eve_pagew_create(EVEPageWidget *widget, EVERect *g, EVEPage *page, EVEPageSpec *spec) {
+    EVEFont *font = spec->font ? spec->font : eve_window_font(page->v.window);
+
+    eve_pagew_init(widget, g, page, font, spec->title, spec->constructor);
 
     return EVE_OK;
 }
 
-void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEFont *font, char *title, eve_view_constructor_t constructor) {
+void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEPage *page, EVEFont *font, char *title, eve_view_constructor_t constructor) {
     EVEWidget *_widget = &widget->w;
 
     memset(widget, 0, sizeof(EVEPageWidget));
-    eve_widget_init(_widget, EVE_WIDGET_TYPE_PAGE, g, font, eve_pagew_touch, eve_pagew_draw, NULL);
-    eve_pagew_update(widget, title, constructor);
+    eve_widget_init(_widget, EVE_WIDGET_TYPE_PAGE, g, page, eve_pagew_draw, eve_pagew_touch, NULL);
+    eve_pagew_update(widget, font, title, constructor);
 }
 
-void eve_pagew_update(EVEPageWidget *widget, char *title, eve_view_constructor_t constructor) {
+void eve_pagew_update(EVEPageWidget *widget, EVEFont *font, char *title, eve_view_constructor_t constructor) {
     EVEWidget *_widget = &widget->w;
 
+    if (font) widget->font = font;
     if (title) widget->title = title;
     if (constructor) widget->constructor = constructor;
-    if (_widget->g.h == 0) _widget->g.h = eve_font_h(_widget->font);
-}
-
-int eve_pagew_touch(EVEWidget *_widget, EVEPage *page, EVETouch *t, uint16_t evt) {
-    EVEPageWidget *widget = (EVEPageWidget *)_widget;
-
-    if (evt & EVE_TOUCH_ETYPE_TAG_UP) {
-        eve_page_open(page, widget->constructor);
-        return 1;
-    }
-
-    return 0;
+    if (_widget->g.h == 0) _widget->g.h = eve_font_h(widget->font);
 }
 
-uint8_t eve_pagew_draw(EVEWidget *_widget, EVEPage *page, uint8_t tag0) {
+uint8_t eve_pagew_draw(EVEWidget *_widget, uint8_t tag0) {
     EVEPageWidget *widget = (EVEPageWidget *)_widget;
 
     _widget->tag0 = tag0;
@@ -57,7 +47,19 @@ uint8_t eve_pagew_draw(EVEWidget *_widget, EVEPage *page, uint8_t tag0) {
     }
     _widget->tagN = tag0;
 
-    eve_cmd(CMD_TEXT, "hhhhs", _widget->g.x, _widget->g.y, _widget->font->id, 0, widget->title);
+    eve_cmd(CMD_TEXT, "hhhhs", _widget->g.x, _widget->g.y, widget->font->id, 0, widget->title);
 
     return _widget->tagN;
 }
+
+int eve_pagew_touch(EVEWidget *_widget, EVETouch *touch, uint16_t evt) {
+    EVEPage *parent = _widget->page;
+    EVEPageWidget *widget = (EVEPageWidget *)_widget;
+
+    if (evt & EVE_TOUCH_ETYPE_TAG_UP) {
+        eve_page_open(parent, widget->constructor);
+        return 1;
+    }
+
+    return 0;
+}