projects_leo/ttgo_smartwatch_prox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #36 from chrismcna/master

Browse Source 
Main Bar - Tile sliding by dragging clock
This commit is contained in:
Dirk Broßwick
2020-08-10 14:40:17 +02:00
committed by GitHub
parent e00f126c92 e19a07c7a7
commit 15ea982ac4
3 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/mainbar/main_tile/main_tile.cpp
View File

@@ -57,7 +57,7 @@ void main_tile_setup( void ) {
lv_style_copy( &datestyle, style);
lv_style_set_text_font( &datestyle, LV_STATE_DEFAULT, &Ubuntu_16px);
clock_cont = lv_obj_create( main_cont, NULL );
clock_cont = mainbar_obj_create( main_cont );
lv_obj_set_size( clock_cont, LV_HOR_RES , LV_VER_RES / 2 );
lv_obj_add_style( clock_cont, LV_OBJ_PART_MAIN, style );
lv_obj_align( clock_cont, main_cont, LV_ALIGN_CENTER, 0, 0 );
@@ -88,7 +88,7 @@ void main_tile_setup( void ) {
lv_obj_align( datelabel, timelabel, LV_ALIGN_OUT_BOTTOM_MID, 0, 0 );
for ( int widget = 0 ; widget < MAX_WIDGET_NUM ; widget++ ) {
widget_entry[ widget ].widget = lv_obj_create( main_cont, NULL );
widget_entry[ widget ].widget = mainbar_obj_create( main_cont );
widget_entry[ widget ].active = false;
lv_obj_reset_style_list( widget_entry[ widget ].widget, LV_OBJ_PART_MAIN );
lv_obj_add_style( widget_entry[ widget ].widget, LV_OBJ_PART_MAIN, style );

12
src/gui/mainbar/mainbar.cpp
View File

@@ -108,10 +108,10 @@ uint32_t mainbar_add_tile( uint16_t x, uint16_t y ) {
tile_pos_table[ tile_entrys - 1 ].x = x;
tile_pos_table[ tile_entrys - 1 ].y = y;
lv_obj_t *my_tile = lv_obj_create( mainbar, NULL);
lv_obj_t *my_tile = lv_cont_create( mainbar, NULL);
tile[ tile_entrys - 1 ].tile = my_tile;
lv_obj_set_size( tile[ tile_entrys - 1 ].tile, LV_HOR_RES, LV_VER_RES);
lv_obj_reset_style_list( tile[ tile_entrys - 1 ].tile, LV_OBJ_PART_MAIN );
//lv_obj_reset_style_list( tile[ tile_entrys - 1 ].tile, LV_OBJ_PART_MAIN );
lv_obj_add_style( tile[ tile_entrys - 1 ].tile, LV_OBJ_PART_MAIN, &mainbar_style );
lv_obj_set_pos( tile[ tile_entrys - 1 ].tile, tile_pos_table[ tile_entrys - 1 ].x * LV_HOR_RES , tile_pos_table[ tile_entrys - 1 ].y * LV_VER_RES );
lv_tileview_add_element( mainbar, tile[ tile_entrys - 1 ].tile );
@@ -178,3 +178,11 @@ void mainbar_jump_to_tilenumber( uint32_t tile_number, lv_anim_enable_t anim ) {
log_e( "tile number %d do not exist", tile_number );
}
}
lv_obj_t * mainbar_obj_create(lv_obj_t *parent)
{
lv_obj_t * child = lv_obj_create( parent, NULL );
lv_tileview_add_element( mainbar, child );
return child;
}

2
src/gui/mainbar/mainbar.h
View File

@@ -107,4 +107,6 @@
*/
lv_style_t *mainbar_get_slider_style( void );
lv_obj_t * mainbar_obj_create(lv_obj_t *parent);
#endif // _MAINBAR_H