diff --git a/Core/Src/PSE_unit_edit_screen.c b/Core/Src/PSE_unit_edit_screen.c index a3e015b..3995c08 100644 --- a/Core/Src/PSE_unit_edit_screen.c +++ b/Core/Src/PSE_unit_edit_screen.c @@ -71,6 +71,36 @@ static lv_obj_t* syringe_widget(lv_obj_t* parent, pse_unit* unit){ lv_label_set_text_fmt(vol, "Seringue : \n%s\nD %d.%d mm", syringe->name, syringe->diameter/1000, syringe->diameter%1000); return cont; } +static lv_obj_t* controls_widget(lv_obj_t* parent, pse_unit* unit){ + // The main container + lv_obj_t* cont = lv_obj_create(parent); + lv_obj_set_size(cont, lv_pct(24), lv_pct(100)); + lv_obj_set_flex_flow(cont, LV_FLEX_FLOW_COLUMN); + // lv_obj_add_event_cb(cont, unit_widget_clicked_handler, LV_EVENT_ALL, pse_unit); + + // forward + lv_obj_t* forw = lv_btn_create(cont); + lv_obj_t* forw_label = lv_label_create(forw); + lv_obj_set_width(forw, lv_pct(100)); + lv_obj_set_flex_grow(forw, 1); + lv_label_set_text(forw_label, LV_SYMBOL_LEFT); + lv_obj_center(forw_label); + // backward + lv_obj_t* back = lv_btn_create(cont); + lv_obj_t* back_label = lv_label_create(back); + lv_obj_set_width(back, lv_pct(100)); + lv_obj_set_flex_grow(back, 1); + lv_label_set_text(back_label, LV_SYMBOL_RIGHT); + lv_obj_center(back_label); + // set Home + lv_obj_t* home = lv_btn_create(cont); + lv_obj_t* home_label = lv_label_create(home); + lv_obj_set_width(home, lv_pct(100)); + lv_obj_set_flex_grow(home, 1); + lv_label_set_text(home_label, LV_SYMBOL_HOME); + lv_obj_center(home_label); + return cont; +} void PSE_unit_edit_screen_Gen(lv_obj_t* parent, pse_unit* unit){ parent_screen = parent; @@ -112,6 +142,9 @@ void PSE_unit_edit_screen_Gen(lv_obj_t* parent, pse_unit* unit){ // Syringe widget lv_obj_t* syringe = syringe_widget(units_grid, unit); lv_obj_set_grid_cell(syringe, LV_GRID_ALIGN_CENTER, 2, 1, LV_GRID_ALIGN_CENTER, 0, 1); + // controls widget + lv_obj_t* controls = controls_widget(units_grid, unit); + lv_obj_set_grid_cell(controls, LV_GRID_ALIGN_CENTER, 3, 1, LV_GRID_ALIGN_CENTER, 0, 1); // fade in the new screen lv_scr_load_anim(scr, LV_SCR_LOAD_ANIM_FADE_ON, 100, 100, false); diff --git a/Core/Src/home_screen.c b/Core/Src/home_screen.c index 32bfd8d..241fde2 100644 --- a/Core/Src/home_screen.c +++ b/Core/Src/home_screen.c @@ -81,6 +81,7 @@ static lv_obj_t* PSE_unit_widget(lv_obj_t* parent, pse_unit* pse_unit){ // home button lv_obj_t* home = lv_btn_create(cont); lv_obj_t* home_label = lv_label_create(home); + lv_obj_set_width(home, lv_pct(100)); lv_obj_set_flex_grow(home, 1); lv_obj_center(home_label); lv_label_set_text(home_label, LV_SYMBOL_HOME);