mirror of
https://github.com/lvgl/lvgl.git
synced 2025-01-28 07:03:00 +08:00
minor fixes
This commit is contained in:
parent
70c8180699
commit
227afda492
@ -391,6 +391,7 @@ _lv_style_state_cmp_t _lv_obj_style_state_compare(lv_obj_t * obj, lv_state_t sta
|
||||
else if(lv_style_get_prop(style, LV_STYLE_TRANSFORM_ZOOM, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_OUTLINE_OPA, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_OUTLINE_PAD, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_OUTLINE_WIDTH, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_SHADOW_WIDTH, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_SHADOW_OPA, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
else if(lv_style_get_prop(style, LV_STYLE_SHADOW_OFS_X, &v)) res = _LV_STYLE_STATE_CMP_DIFF_DRAW_PAD;
|
||||
|
@ -101,7 +101,6 @@ static void style_init(void)
|
||||
lv_style_set_arc_width(&styles->light, LV_DPX(2));
|
||||
lv_style_set_arc_color(&styles->light, COLOR_MID);
|
||||
|
||||
|
||||
style_init_reset(&styles->dark);
|
||||
lv_style_set_bg_opa(&styles->dark, LV_OPA_COVER);
|
||||
lv_style_set_bg_color(&styles->dark, COLOR_DARK);
|
||||
|
@ -38,7 +38,7 @@ static const char * year_list = {
|
||||
"1980\n1979\n1978\n1977\n1976\n1975\n1974\n1973\n1972\n1971\n1970\n1969\n1968\n1967\n1966\n1965\n1964\n1963\n1962\n1961\n"
|
||||
"1960\n1959\n1958\n1957\n1956\n1955\n1954\n1953\n1952\n1951\n1950\n1949\n1948\n1947\n1946\n1945\n1944\n1943\n1942\n1941\n"
|
||||
"1940\n1939\n1938\n1937\n1936\n1935\n1934\n1933\n1932\n1931\n1930\n1929\n1928\n1927\n1926\n1925\n1924\n1923\n1922\n1921\n"
|
||||
"1920\n1919\n1918\n1917\n1916\n1915\n1914\n1913\n1912\n1911\n1910\n1909\n1908\n1907\n1906\n1905\n1904\n1903\n1902\n0901"
|
||||
"1920\n1919\n1918\n1917\n1916\n1915\n1914\n1913\n1912\n1911\n1910\n1909\n1908\n1907\n1906\n1905\n1904\n1903\n1902\n1901"
|
||||
};
|
||||
|
||||
/**********************
|
||||
|
@ -74,7 +74,9 @@ lv_obj_t * lv_list_add_btn(lv_obj_t * list, const char * icon, const char * txt,
|
||||
{
|
||||
lv_obj_t * btn = lv_obj_create_from_class(&lv_list_btn_class, list);
|
||||
lv_obj_set_size(btn, LV_PCT(100), LV_SIZE_CONTENT);
|
||||
lv_obj_add_event_cb(btn, event_cb, LV_EVENT_ALL, NULL);
|
||||
if(event_cb) {
|
||||
lv_obj_add_event_cb(btn, event_cb, LV_EVENT_ALL, NULL);
|
||||
}
|
||||
|
||||
if(icon) {
|
||||
lv_obj_t * img = lv_img_create(btn);
|
||||
|
Loading…
x
Reference in New Issue
Block a user