github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

api(style) remove content style proeprties

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2021-03-25 13:36:50 +01:00
parent b7becbbb22
commit 53f3cc1827
158 changed files with 701 additions and 1364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
examples/widgets/btn/lv_example_btn_1.c
View File

@@ -16,24 +16,21 @@ void lv_example_btn_1(void)
{
lv_obj_t * label;
//
// lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);
// lv_obj_add_event_cb(btn1, event_handler, NULL);
// lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, -40);
//
// label = lv_label_create(btn1, NULL);
// lv_label_set_text(label, "Button");
// lv_obj_center(label);
lv_obj_t * btn1 = lv_btn_create(lv_scr_act());
lv_obj_add_event_cb(btn1, event_handler, NULL);
lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, -40);
lv_obj_t * btn2 = lv_btn_create(lv_scr_act(), NULL);
label = lv_label_create(btn1);
lv_label_set_text(label, "Button");
lv_obj_center(label);
lv_obj_t * btn2 = lv_btn_create(lv_scr_act());
lv_obj_add_event_cb(btn2, event_handler, NULL);
lv_obj_align(btn2, NULL, LV_ALIGN_CENTER, 0, 40);
lv_obj_add_flag(btn2, LV_OBJ_FLAG_CHECKABLE);
// lv_obj_set_height(btn2, LV_SIZE_CONTENT);
lv_obj_set_height(btn2, LV_SIZE_CONTENT);
label = lv_label_create(btn2, NULL);
label = lv_label_create(btn2);
lv_label_set_text(label, "Toggle");
// lv_obj_update_layout(btn2);
// lv_obj_update_layout(cont);
}
#endif

4
examples/widgets/btn/lv_example_btn_2.c
View File

@@ -37,13 +37,13 @@ void lv_example_btn_2(void)
lv_style_set_bg_color(&style_pr, lv_color_blue_darken_2());
lv_style_set_bg_grad_color(&style_pr, lv_color_blue_darken_4());
lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);
lv_obj_t * btn1 = lv_btn_create(lv_scr_act());
lv_obj_remove_style(btn1, LV_PART_ANY, LV_STATE_ANY, NULL);
lv_obj_add_style(btn1, LV_PART_MAIN, LV_STATE_DEFAULT, &style);
lv_obj_add_style(btn1, LV_PART_MAIN, LV_STATE_PRESSED, &style_pr);
lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, 0);
lv_obj_t * label = lv_label_create(btn1, NULL);
lv_obj_t * label = lv_label_create(btn1);
lv_label_set_text(label, "Button");
lv_obj_align(label, NULL, LV_ALIGN_CENTER, 0, 0);

13
examples/widgets/btn/lv_example_btn_3.c
View File

@@ -1,6 +1,6 @@
#include "../../../lvgl.h"
#include <stdio.h>
#if LV_USE_BTN
#if LV_BUILD_EXAMPLES && LV_USE_BTN
/**
* Create a style transition on a button to act like a gum when clicked
@@ -9,7 +9,7 @@ void lv_example_btn_3(void)
{
/*Properties to transition*/
static lv_style_prop_t props[] = {
LV_STYLE_TRANSFORM_WIDTH, LV_STYLE_TRANSFORM_HEIGHT, LV_STYLE_CONTENT_LETTER_SPACE, 0
LV_STYLE_TRANSFORM_WIDTH, LV_STYLE_TRANSFORM_HEIGHT, LV_STYLE_TEXT_LETTER_SPACE, 0
};
/*Define animation paths*/
@@ -42,16 +42,15 @@ void lv_example_btn_3(void)
lv_style_init(&style_pr);
lv_style_set_transform_width(&style_pr, 10);
lv_style_set_transform_height(&style_pr, -10);
lv_style_set_content_letter_space(&style_pr, 10);
lv_style_set_text_letter_space(&style_pr, 10);
lv_style_set_transition(&style_pr, &transition_dsc_pr);
lv_obj_t * btn1 = lv_btn_create(lv_scr_act(), NULL);
lv_obj_t * btn1 = lv_btn_create(lv_scr_act());
lv_obj_align(btn1, NULL, LV_ALIGN_CENTER, 0, -80);
lv_obj_add_style(btn1, LV_PART_MAIN, LV_STATE_PRESSED, &style_pr);
lv_obj_add_style(btn1, LV_PART_MAIN, LV_STATE_DEFAULT, &style_def);
/*Instead of creating a label add a values string*/
lv_obj_set_style_content_text(btn1, LV_PART_MAIN, LV_STATE_DEFAULT, "Gum");
lv_obj_t * label = lv_label_create(btn1);
lv_label_set_text(label, "Gum");
}
#endif