piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): Slider control blocking RTN key, slider rotEnc activation (#3966)

Browse Source 
* Fix for slider control blocking RTN key.

* Fix rotary encoder activation for slider.
This commit is contained in:
philmoz
2023-08-26 21:18:35 +10:00
committed by GitHub
parent c2bebfbbd3
commit 7aadf5e3ef
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/gui/colorlcd/themes/etx_lv_theme.cpp
+3
View File
@@ -523,6 +523,9 @@ void etx_slider_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
lv_obj_add_style(obj, &styles.circle, LV_PART_KNOB); lv_obj_add_style(obj, &styles.circle, LV_PART_KNOB);
lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_MAIN | LV_STATE_FOCUSED); lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_MAIN | LV_STATE_FOCUSED);
lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_MAIN | LV_STATE_FOCUSED | LV_STATE_EDITED); lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_MAIN | LV_STATE_FOCUSED | LV_STATE_EDITED);
lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_INDICATOR | LV_STATE_FOCUSED);
lv_obj_add_style(obj, &styles.bg_color_focus, LV_PART_INDICATOR | LV_STATE_FOCUSED | LV_STATE_EDITED);
lv_obj_add_style(obj, &styles.bg_color_edit, LV_PART_KNOB | LV_STATE_FOCUSED | LV_STATE_EDITED);
} }
void etx_btnmatrix_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj) void etx_btnmatrix_constructor(const lv_obj_class_t * class_p, lv_obj_t * obj)
radio/src/thirdparty/libopenui/src/slider.cpp
Vendored
+1 -1
View File
@@ -43,7 +43,7 @@ Slider::Slider(Window* parent, coord_t width, int32_t vmin, int32_t vmax,
{ {
padAll(7); padAll(7);
auto slider = etx_slider_create(lvobj); auto slider = (new FormField(this, rect_t{}, 0, 0, etx_slider_create))->getLvObj();
lv_obj_set_width(slider, lv_pct(100)); lv_obj_set_width(slider, lv_pct(100));
lv_obj_add_event_cb(slider, slider_changed_cb, LV_EVENT_VALUE_CHANGED, this); lv_obj_add_event_cb(slider, slider_changed_cb, LV_EVENT_VALUE_CHANGED, this);