1 files changed, 14 insertions, 4 deletions

diff --git a/fw/fe310/eos/eve/widget/pagew.c b/fw/fe310/eos/eve/widget/pagew.c
index 77e8f01..0ce4e82 100644
--- a/fw/fe310/eos/eve/widget/pagew.c
+++ b/fw/fe310/eos/eve/widget/pagew.c
@@ -10,8 +10,12 @@
 
 #include "widget.h"
 
-void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEPage *page, EVEFont *font, char *title, eve_view_constructor_t constructor) {
+int eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEPage *page, EVEFont *font, char *title, eve_view_constructor_t constructor) {
     EVEWidget *_widget = &widget->w;
+    int title_w, rv;
+
+    rv = eve_font_verify(font, title, 0, &title_w, NULL);
+    if (rv) return rv;
 
     memset(widget, 0, sizeof(EVEPageWidget));
     eve_widget_init(_widget, EVE_WIDGET_TYPE_PAGE, g, page, eve_pagew_draw, eve_pagew_touch, NULL);
@@ -19,16 +23,19 @@ void eve_pagew_init(EVEPageWidget *widget, EVERect *g, EVEPage *page, EVEFont *f
     widget->title = title;
     widget->constructor = constructor;
     if (_widget->g.h == 0) _widget->g.h = eve_font_h(widget->font);
+    if (_widget->g.w == 0) _widget->g.w = title_w;
+
+    return EVE_OK;
 }
 
 int eve_pagew_create(EVEWidget *_widget, EVEWidgetSpec *spec, EVEPage *page) {
     EVEPageWidget *widget = (EVEPageWidget *)_widget;
     EVEPageSpec *tspec = &spec->tspec.page;
     EVEFont *font = tspec->font ? tspec->font : eve_window_font(page->v.window);
+    int rv;
 
-    eve_pagew_init(widget, &spec->g, page, font, tspec->title, tspec->constructor);
-
-    return EVE_OK;
+    rv = eve_pagew_init(widget, &spec->g, page, font, tspec->title, tspec->constructor);
+    return rv;
 }
 
 uint8_t eve_pagew_draw(EVEWidget *_widget, uint8_t tag0) {
@@ -50,6 +57,9 @@ int eve_pagew_touch(EVEWidget *_widget, EVETouch *touch, uint16_t evt) {
     EVEPage *parent = _widget->page;
     EVEPageWidget *widget = (EVEPageWidget *)_widget;
 
+    /* widget received non-touch event, always return 0 */
+    if (evt & EVE_TOUCH_ETYPE_EXT) return 0;
+
     if (evt & EVE_TOUCH_ETYPE_TAG_UP) {
         eve_page_open(parent, widget->constructor);
         return 1;