From f364c6ef630d3c3c91418ef3ce3cd8af0fcb2bd0 Mon Sep 17 00:00:00 2001 From: philmoz Date: Sun, 20 Sep 2026 10:42:37 +1000 Subject: [PATCH] chore(color): remove unused LV_OBJ_FLAG_ENCODER_ACCEL define. (#7809) --- radio/src/gui/colorlcd/controls/color_editor.cpp | 2 -- radio/src/gui/colorlcd/libui/libopenui_defines.h | 2 -- radio/src/gui/colorlcd/libui/menu.cpp | 3 --- radio/src/gui/colorlcd/libui/numberedit.cpp | 3 --- radio/src/gui/colorlcd/radio/radio_mic_recorder.cpp | 1 - 5 files changed, 11 deletions(-) diff --git a/radio/src/gui/colorlcd/controls/color_editor.cpp b/radio/src/gui/colorlcd/controls/color_editor.cpp index 3a7d3e7f6..da6c56747 100644 --- a/radio/src/gui/colorlcd/controls/color_editor.cpp +++ b/radio/src/gui/colorlcd/controls/color_editor.cpp @@ -50,8 +50,6 @@ class ColorBar : public FormField uint32_t maxValue = 0) : FormField(parent, r) { - lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL); - lv_group_add_obj((lv_group_t*)lv_group_get_default(), lvobj); lv_obj_add_event_cb(lvobj, ColorBar::pressing, LV_EVENT_PRESSING, nullptr); diff --git a/radio/src/gui/colorlcd/libui/libopenui_defines.h b/radio/src/gui/colorlcd/libui/libopenui_defines.h index fd7305468..23f020d96 100644 --- a/radio/src/gui/colorlcd/libui/libopenui_defines.h +++ b/radio/src/gui/colorlcd/libui/libopenui_defines.h @@ -42,5 +42,3 @@ /* telemetry flags */ #define NO_UNIT 0x40u - -#define LV_OBJ_FLAG_ENCODER_ACCEL LV_OBJ_FLAG_USER_1 diff --git a/radio/src/gui/colorlcd/libui/menu.cpp b/radio/src/gui/colorlcd/libui/menu.cpp index 5c37f0b4c..d0bd368d5 100644 --- a/radio/src/gui/colorlcd/libui/menu.cpp +++ b/radio/src/gui/colorlcd/libui/menu.cpp @@ -64,9 +64,6 @@ class MenuBody : public TableField MenuBody(Window* parent, const rect_t& rect) : TableField(parent, rect) { - // Allow encoder acceleration - lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL); - setColumnWidth(0, rect.w); setAutoEdit(); diff --git a/radio/src/gui/colorlcd/libui/numberedit.cpp b/radio/src/gui/colorlcd/libui/numberedit.cpp index b9454bd94..56ad05019 100644 --- a/radio/src/gui/colorlcd/libui/numberedit.cpp +++ b/radio/src/gui/colorlcd/libui/numberedit.cpp @@ -35,9 +35,6 @@ class NumberArea : public FormField { setWindowFlag(NO_FOCUS); - // Allow encoder acceleration - lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL); - lv_obj_add_event_cb(lvobj, NumberArea::numberedit_cb, LV_EVENT_KEY, this); setFocusHandler([=](bool focus) { diff --git a/radio/src/gui/colorlcd/radio/radio_mic_recorder.cpp b/radio/src/gui/colorlcd/radio/radio_mic_recorder.cpp index 6df5f23e0..77d76155c 100644 --- a/radio/src/gui/colorlcd/radio/radio_mic_recorder.cpp +++ b/radio/src/gui/colorlcd/radio/radio_mic_recorder.cpp @@ -69,7 +69,6 @@ class WaveformView : public FormField // No click focus either: LVGL clears the group's edit mode on every focus // call, so a touch would otherwise leave the encoder stuck in navigation. lv_obj_clear_flag(lvobj, LV_OBJ_FLAG_CLICK_FOCUSABLE); - lv_obj_add_flag(lvobj, LV_OBJ_FLAG_ENCODER_ACCEL); lv_obj_add_event_cb(lvobj, WaveformView::on_pressing, LV_EVENT_PRESSING, this); lv_obj_add_event_cb(lvobj, WaveformView::on_released, LV_EVENT_RELEASED, this); lv_obj_add_event_cb(lvobj, WaveformView::on_key, LV_EVENT_KEY, this);