@@ -47,7 +47,6 @@ static void basic_init() {
47
47
style_init_reset (&style_box);
48
48
lv_style_set_bg_opa (&style_box, LV_STATE_DEFAULT, LV_OPA_COVER);
49
49
lv_style_set_radius (&style_box, LV_STATE_DEFAULT, 10 );
50
- lv_style_set_value_color (&style_box, LV_STATE_DEFAULT, Colors::bg);
51
50
lv_style_set_value_font (&style_box, LV_STATE_DEFAULT, theme.font_normal );
52
51
53
52
style_init_reset (&style_label_white);
@@ -60,25 +59,12 @@ static void basic_init() {
60
59
lv_style_set_bg_color (&style_btn, LV_STATE_DEFAULT, Colors::bg);
61
60
lv_style_set_bg_color (&style_btn, LV_STATE_CHECKED, Colors::highlight);
62
61
lv_style_set_bg_color (&style_btn, LV_STATE_DISABLED, Colors::bgDark);
63
- lv_style_set_border_color (&style_btn, LV_STATE_DEFAULT, LV_COLOR_WHITE);
64
- lv_style_set_border_width (&style_btn, LV_STATE_DEFAULT, 0 );
65
62
66
63
lv_style_set_text_color (&style_btn, LV_STATE_DEFAULT, LV_COLOR_WHITE);
67
64
lv_style_set_text_color (&style_btn, LV_STATE_DISABLED, LV_COLOR_GRAY);
68
65
69
- lv_style_set_value_color (&style_btn, LV_STATE_DEFAULT, LV_COLOR_WHITE);
70
- lv_style_set_value_color (&style_btn, LV_STATE_DISABLED, LV_COLOR_GRAY);
71
-
72
- lv_style_set_pad_left (&style_btn, LV_STATE_DEFAULT, LV_DPX (20 ));
73
- lv_style_set_pad_right (&style_btn, LV_STATE_DEFAULT, LV_DPX (20 ));
74
- lv_style_set_pad_top (&style_btn, LV_STATE_DEFAULT, LV_DPX (20 ));
75
- lv_style_set_pad_bottom (&style_btn, LV_STATE_DEFAULT, LV_DPX (20 ));
66
+ lv_style_set_pad_all (&style_btn, LV_STATE_DEFAULT, LV_DPX (20 ));
76
67
lv_style_set_pad_inner (&style_btn, LV_STATE_DEFAULT, LV_DPX (15 ));
77
- lv_style_set_outline_width (&style_btn, LV_STATE_DEFAULT, LV_DPX (2 ));
78
- lv_style_set_outline_opa (&style_btn, LV_STATE_DEFAULT, LV_OPA_0);
79
- lv_style_set_outline_color (&style_btn, LV_STATE_DEFAULT, LV_COLOR_WHITE);
80
- lv_style_set_transition_time (&style_btn, LV_STATE_DEFAULT, 0 );
81
- lv_style_set_transition_delay (&style_btn, LV_STATE_DEFAULT, 0 );
82
68
83
69
style_init_reset (&style_icon);
84
70
lv_style_set_text_color (&style_icon, LV_STATE_DEFAULT, LV_COLOR_WHITE);
@@ -132,25 +118,16 @@ static void basic_init() {
132
118
lv_style_set_bg_color (&style_sw_knob, LV_STATE_DEFAULT, LV_COLOR_SILVER);
133
119
lv_style_set_bg_color (&style_sw_knob, LV_STATE_CHECKED, LV_COLOR_WHITE);
134
120
lv_style_set_radius (&style_sw_knob, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
135
- lv_style_set_pad_top (&style_sw_knob, LV_STATE_DEFAULT, -4 );
136
- lv_style_set_pad_bottom (&style_sw_knob, LV_STATE_DEFAULT, -4 );
137
- lv_style_set_pad_left (&style_sw_knob, LV_STATE_DEFAULT, -4 );
138
- lv_style_set_pad_right (&style_sw_knob, LV_STATE_DEFAULT, -4 );
121
+ lv_style_set_pad_all (&style_sw_knob, LV_STATE_DEFAULT, -4 );
139
122
140
123
style_init_reset (&style_slider_knob);
141
124
lv_style_set_bg_opa (&style_slider_knob, LV_STATE_DEFAULT, LV_OPA_COVER);
142
125
lv_style_set_bg_color (&style_slider_knob, LV_STATE_DEFAULT, LV_COLOR_RED);
143
126
lv_style_set_border_color (&style_slider_knob, LV_STATE_DEFAULT, LV_COLOR_WHITE);
144
127
lv_style_set_border_width (&style_slider_knob, LV_STATE_DEFAULT, 6 );
145
128
lv_style_set_radius (&style_slider_knob, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
146
- lv_style_set_pad_top (&style_slider_knob, LV_STATE_DEFAULT, 10 );
147
- lv_style_set_pad_bottom (&style_slider_knob, LV_STATE_DEFAULT, 10 );
148
- lv_style_set_pad_left (&style_slider_knob, LV_STATE_DEFAULT, 10 );
149
- lv_style_set_pad_right (&style_slider_knob, LV_STATE_DEFAULT, 10 );
150
- lv_style_set_pad_top (&style_slider_knob, LV_STATE_PRESSED, 14 );
151
- lv_style_set_pad_bottom (&style_slider_knob, LV_STATE_PRESSED, 14 );
152
- lv_style_set_pad_left (&style_slider_knob, LV_STATE_PRESSED, 14 );
153
- lv_style_set_pad_right (&style_slider_knob, LV_STATE_PRESSED, 14 );
129
+ lv_style_set_pad_all (&style_slider_knob, LV_STATE_DEFAULT, 10 );
130
+ lv_style_set_pad_all (&style_slider_knob, LV_STATE_PRESSED, 14 );
154
131
155
132
style_init_reset (&style_arc_indic);
156
133
lv_style_set_line_color (&style_arc_indic, LV_STATE_DEFAULT, Colors::lightGray);
@@ -180,10 +157,7 @@ static void basic_init() {
180
157
181
158
style_init_reset (&style_pad_small);
182
159
lv_style_int_t pad_small_value = 10 ;
183
- lv_style_set_pad_left (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
184
- lv_style_set_pad_right (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
185
- lv_style_set_pad_top (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
186
- lv_style_set_pad_bottom (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
160
+ lv_style_set_pad_all (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
187
161
lv_style_set_pad_inner (&style_pad_small, LV_STATE_DEFAULT, pad_small_value);
188
162
189
163
style_init_reset (&style_lmeter);
@@ -209,20 +183,12 @@ static void basic_init() {
209
183
lv_style_reset (&style_cb_bg);
210
184
lv_style_set_radius (&style_cb_bg, LV_STATE_DEFAULT, LV_DPX (4 ));
211
185
lv_style_set_pad_inner (&style_cb_bg, LV_STATE_DEFAULT, 18 );
212
- lv_style_set_outline_color (&style_cb_bg, LV_STATE_DEFAULT, LV_COLOR_WHITE);
213
- lv_style_set_outline_width (&style_cb_bg, LV_STATE_DEFAULT, LV_DPX (2 ));
214
- lv_style_set_outline_pad (&style_cb_bg, LV_STATE_DEFAULT, LV_DPX (20 ));
215
- lv_style_set_transition_time (&style_cb_bg, LV_STATE_DEFAULT, 0 );
216
- lv_style_set_transition_prop_6 (&style_cb_bg, LV_STATE_DEFAULT, LV_STYLE_OUTLINE_OPA);
217
186
218
187
lv_style_reset (&style_cb_bullet);
219
188
lv_style_set_radius (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (4 ));
220
189
lv_style_set_pattern_image (&style_cb_bullet, LV_STATE_CHECKED, LV_SYMBOL_OK);
221
190
lv_style_set_pattern_recolor (&style_cb_bullet, LV_STATE_CHECKED, LV_COLOR_WHITE);
222
- lv_style_set_pad_left (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (8 ));
223
- lv_style_set_pad_right (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (8 ));
224
- lv_style_set_pad_top (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (8 ));
225
- lv_style_set_pad_bottom (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (8 ));
191
+ lv_style_set_pad_all (&style_cb_bullet, LV_STATE_DEFAULT, LV_DPX (8 ));
226
192
}
227
193
228
194
/* *
0 commit comments