code layout

1 files changed, 6 insertions, 10 deletions

diff --git a/fw/fe310/eos/eve/widget/spacerw.c b/fw/fe310/eos/eve/widget/spacerw.c
index d9f9104..aa5bec1 100644
--- a/fw/fe310/eos/eve/widget/spacerw.c
+++ b/fw/fe310/eos/eve/widget/spacerw.c
@@ -8,21 +8,17 @@
 #include "screen/window.h"
 #include "screen/page.h"
 
-#include "label.h"
 #include "widget.h"
-#include "spacerw.h"
 
-int eve_spacerw_create(EVESpacerWidget *widget, EVERect *g, EVEPage *page, EVESpacerSpec *spec) {
-    eve_spacerw_init(widget, g, page);
-
-    return EVE_OK;
+void eve_spacerw_init(EVEWidget *widget, EVERect *g, EVEPage *page) {
+    memset(widget, 0, sizeof(EVEWidget));
+    eve_widget_init(widget, EVE_WIDGET_TYPE_SPACER, g, page, eve_spacerw_draw, eve_spacerw_touch, NULL);
 }
 
-void eve_spacerw_init(EVESpacerWidget *widget, EVERect *g, EVEPage *page) {
-    EVEWidget *_widget = &widget->w;
+int eve_spacerw_create(EVEWidget *_widget, EVEWidgetSpec *spec, EVEPage *page) {
+    eve_spacerw_init(_widget, &spec->g, page);
 
-    memset(widget, 0, sizeof(EVESpacerWidget));
-    eve_widget_init(_widget, EVE_WIDGET_TYPE_SPACER, g, page, eve_spacerw_draw, eve_spacerw_touch, NULL);
+    return EVE_OK;
 }
 
 uint8_t eve_spacerw_draw(EVEWidget *_widget, uint8_t tag0) {