tile -> window; opverlapping windows added

1 files changed, 5 insertions, 11 deletions

diff --git a/code/fe310/eos/eve/screen/page.h b/code/fe310/eos/eve/screen/page.h
index 453bfcf..42cae7d 100644
--- a/code/fe310/eos/eve/screen/page.h
+++ b/code/fe310/eos/eve/screen/page.h
@@ -8,22 +8,16 @@ typedef void (*eve_page_close_t) (struct EVEPage *);
 typedef void (*eve_page_evt_handler_t) (struct EVEPage *, struct EVEWidget *, EVETouch *, uint16_t, uint8_t, int);
 
 typedef struct EVEPage {
-    EVECanvas c;
+    EVEView v;
     int16_t win_x;
     int16_t win_y;
-    eve_page_evt_handler_t handle_evt;
     eve_page_open_t open;
     eve_page_close_t close;
-    EVETile *tile;
+    eve_page_evt_handler_t handle_evt;
+    EVEWindow *window;
 } EVEPage;
 
-typedef struct EVEPageFocus {
-    struct EVEWidget *w;
-    EVEWindow f;
-} EVEPageFocus;
-
-void eve_page_init(EVEPage *page, EVETile *tile, eve_canvas_touch_t touch, eve_canvas_draw_t draw, eve_page_open_t open, eve_page_close_t close);
-void eve_page_focus(EVEPage *page, EVEPageFocus *focus);
-void eve_page_widget_focus(EVEPageFocus *focus, struct EVEWidget *widget);
+void eve_page_init(EVEPage *page, eve_view_touch_t touch, eve_view_draw_t draw, eve_page_open_t open, eve_page_close_t close, EVEWindow *window);
+void eve_page_focus(EVEPage *page, EVERect *focus);
 int eve_page_widget_visible(EVEPage *page, struct EVEWidget *widget);
 void eve_page_handle_evt(EVEPage *page, struct EVEWidget *widget, EVETouch *touch, uint16_t evt, uint8_t tag0, int touch_idx);