Converted all menu icons to chroma key transparency, added new makefiles to demos to test them
This commit is contained in:
parent
9c46eff761
commit
d13e201767
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
@ -11,7 +11,8 @@ void watch_item_cb(lv_event_t *e)
|
|||||||
|
|
||||||
extern WatchFace_t watchFace;
|
extern WatchFace_t watchFace;
|
||||||
watch_face_create(&watchFace);
|
watch_face_create(&watchFace);
|
||||||
lv_scr_load_anim(watchFace.display, LV_SCR_LOAD_ANIM_FADE_ON, 400, 0, true);
|
//lv_scr_load_anim(watchFace.display, LV_SCR_LOAD_ANIM_FADE_ON, 700, 0, true);
|
||||||
|
lv_scr_load_anim(watchFace.display, LV_SCR_LOAD_ANIM_MOVE_LEFT, 400, 0, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void settings_item_cb(lv_event_t *e)
|
void settings_item_cb(lv_event_t *e)
|
||||||
@ -119,7 +120,7 @@ void menu_screen_create(MenuScreen_t * const menuScreen)
|
|||||||
menu_screen_add_item(scroll_item_container, 3, &watch_menu_mail_icon, "Mails", NULL);
|
menu_screen_add_item(scroll_item_container, 3, &watch_menu_mail_icon, "Mails", NULL);
|
||||||
menu_screen_add_item(scroll_item_container, 4, &watch_menu_dialer_icon, "Phone", NULL);
|
menu_screen_add_item(scroll_item_container, 4, &watch_menu_dialer_icon, "Phone", NULL);
|
||||||
menu_screen_add_item(scroll_item_container, 5,&watch_menu_contacts_icon, "Contacts", NULL);
|
menu_screen_add_item(scroll_item_container, 5,&watch_menu_contacts_icon, "Contacts", NULL);
|
||||||
menu_screen_add_item(scroll_item_container, 6,&watch_menu_settings_icon, "Contacts", &(settings_item_cb));
|
menu_screen_add_item(scroll_item_container, 6,&watch_menu_settings_icon, "Settings", &(settings_item_cb));
|
||||||
|
|
||||||
//We register the event callback to handle the cleanup
|
//We register the event callback to handle the cleanup
|
||||||
lv_obj_add_event_cb(menuScreen->display, &(cleanup_event_cb), LV_EVENT_DELETE, menuScreen);
|
lv_obj_add_event_cb(menuScreen->display, &(cleanup_event_cb), LV_EVENT_DELETE, menuScreen);
|
||||||
|
File diff suppressed because one or more lines are too long
@ -222,7 +222,7 @@ void watch_face_create(WatchFace_t * const watchFace)
|
|||||||
watchFace->handAnimationTimer = NULL;
|
watchFace->handAnimationTimer = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
watchFace->handAnimationTimer = lv_timer_create(&(hand_timer_anim_cb), 200, watchFace);
|
watchFace->handAnimationTimer = lv_timer_create(&(hand_timer_anim_cb), 199, watchFace);
|
||||||
}
|
}
|
||||||
|
|
||||||
void watch_face_destroy(WatchFace_t * const watchFace)
|
void watch_face_destroy(WatchFace_t * const watchFace)
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -4,7 +4,8 @@ sinclude $(TOP_DIR)/tools/w800/conf.mk
|
|||||||
ifndef PDIR
|
ifndef PDIR
|
||||||
GEN_LIBS = liblvgldemos$(LIB_EXT)
|
GEN_LIBS = liblvgldemos$(LIB_EXT)
|
||||||
COMPONENTS_liblvgldemos = widgets/liblvgldemoswidgets$(LIB_EXT) \
|
COMPONENTS_liblvgldemos = widgets/liblvgldemoswidgets$(LIB_EXT) \
|
||||||
stress/liblvgldemosstress$(LIB_EXT)
|
stress/liblvgldemosstress$(LIB_EXT) \
|
||||||
|
benchmark/liblvgldemosbenchmark$(LIB_EXT)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
#DEFINES +=
|
#DEFINES +=
|
||||||
|
@ -0,0 +1,16 @@
|
|||||||
|
TOP_DIR = ../../../..
|
||||||
|
sinclude $(TOP_DIR)/tools/w800/conf.mk
|
||||||
|
|
||||||
|
ifndef PDIR
|
||||||
|
GEN_LIBS = liblvgldemosbenchmark$(LIB_EXT)
|
||||||
|
COMPONENTS_liblvgldemosbenchmark = assets/liblvgldemosbenchmarkassets$(LIB_EXT)
|
||||||
|
endif
|
||||||
|
|
||||||
|
#DEFINES +=
|
||||||
|
|
||||||
|
sinclude $(TOP_DIR)/tools/w800/rules.mk
|
||||||
|
|
||||||
|
INCLUDES := $(INCLUDES) -I $(PDIR)include
|
||||||
|
|
||||||
|
PDIR := ../$(PDIR)
|
||||||
|
sinclude $(PDIR)Makefile
|
@ -0,0 +1,15 @@
|
|||||||
|
TOP_DIR = ../../../../..
|
||||||
|
sinclude $(TOP_DIR)/tools/w800/conf.mk
|
||||||
|
|
||||||
|
ifndef PDIR
|
||||||
|
GEN_LIBS = liblvgldemosbenchmarkassets$(LIB_EXT)
|
||||||
|
endif
|
||||||
|
|
||||||
|
#DEFINES +=
|
||||||
|
|
||||||
|
sinclude $(TOP_DIR)/tools/w800/rules.mk
|
||||||
|
|
||||||
|
INCLUDES := $(INCLUDES) -I $(PDIR)include
|
||||||
|
|
||||||
|
PDIR := ../$(PDIR)
|
||||||
|
sinclude $(PDIR)Makefile
|
Loading…
Reference in New Issue
Block a user