choice: dramatically reduce refresh frequency
Done now only when a real change happened
This commit is contained in:
committed by
Raphael Coeffic
parent
2ba8619654
commit
170fa8152e
+7
-3
@@ -21,11 +21,11 @@
|
|||||||
#include "menu.h"
|
#include "menu.h"
|
||||||
#include "theme.h"
|
#include "theme.h"
|
||||||
|
|
||||||
void choicePaintCallback(lv_event_t *e)
|
void choice_changed_cb(lv_event_t *e)
|
||||||
{
|
{
|
||||||
auto code = lv_event_get_code(e);
|
auto code = lv_event_get_code(e);
|
||||||
|
|
||||||
if (code == LV_EVENT_DRAW_MAIN_BEGIN) {
|
if (code == LV_EVENT_VALUE_CHANGED) {
|
||||||
lv_obj_t *target = lv_event_get_target(e);
|
lv_obj_t *target = lv_event_get_target(e);
|
||||||
if (target != nullptr) {
|
if (target != nullptr) {
|
||||||
ChoiceBase *cb = (ChoiceBase*)lv_obj_get_user_data(target);
|
ChoiceBase *cb = (ChoiceBase*)lv_obj_get_user_data(target);
|
||||||
@@ -46,7 +46,7 @@ ChoiceBase::ChoiceBase(Window* parent, const rect_t& rect, ChoiceType type,
|
|||||||
lv_obj_set_layout(lvobj, LV_LAYOUT_FLEX);
|
lv_obj_set_layout(lvobj, LV_LAYOUT_FLEX);
|
||||||
lv_obj_set_flex_flow(lvobj, LV_FLEX_FLOW_ROW);
|
lv_obj_set_flex_flow(lvobj, LV_FLEX_FLOW_ROW);
|
||||||
|
|
||||||
lv_obj_add_event_cb(lvobj, choicePaintCallback, LV_EVENT_DRAW_MAIN_BEGIN, lvobj);
|
lv_obj_add_event_cb(lvobj, choice_changed_cb, LV_EVENT_VALUE_CHANGED, lvobj);
|
||||||
label = lv_label_create(lvobj);
|
label = lv_label_create(lvobj);
|
||||||
|
|
||||||
lv_group_t * def_group = lv_group_get_default();
|
lv_group_t * def_group = lv_group_get_default();
|
||||||
@@ -99,6 +99,7 @@ Choice::Choice(Window* parent, const rect_t & rect, int vmin, int vmax,
|
|||||||
getValue(std::move(getValue)),
|
getValue(std::move(getValue)),
|
||||||
setValue(std::move(setValue))
|
setValue(std::move(setValue))
|
||||||
{
|
{
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
Choice::Choice(Window* parent, const rect_t& rect, const char* const values[],
|
Choice::Choice(Window* parent, const rect_t& rect, const char* const values[],
|
||||||
@@ -111,6 +112,7 @@ Choice::Choice(Window* parent, const rect_t& rect, const char* const values[],
|
|||||||
setValue(std::move(setValue))
|
setValue(std::move(setValue))
|
||||||
{
|
{
|
||||||
setValues(values);
|
setValues(values);
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
Choice::Choice(Window* parent, const rect_t& rect,
|
Choice::Choice(Window* parent, const rect_t& rect,
|
||||||
@@ -124,6 +126,7 @@ Choice::Choice(Window* parent, const rect_t& rect,
|
|||||||
getValue(std::move(getValue)),
|
getValue(std::move(getValue)),
|
||||||
setValue(std::move(setValue))
|
setValue(std::move(setValue))
|
||||||
{
|
{
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
Choice::Choice(Window* parent, const rect_t& rect, const char* values, int vmin,
|
Choice::Choice(Window* parent, const rect_t& rect, const char* values, int vmin,
|
||||||
@@ -144,6 +147,7 @@ Choice::Choice(Window* parent, const rect_t& rect, const char* values, int vmin,
|
|||||||
value += len;
|
value += len;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Choice::addValue(const char * value)
|
void Choice::addValue(const char * value)
|
||||||
|
|||||||
+2
-1
@@ -40,7 +40,7 @@ class ChoiceBase : public FormField
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
friend void choicePaintCallback(lv_event_t *e);
|
friend void choice_changed_cb(lv_event_t *e);
|
||||||
ChoiceType type;
|
ChoiceType type;
|
||||||
lv_obj_t *label;
|
lv_obj_t *label;
|
||||||
virtual std::string getLabelText() { return ""; };
|
virtual std::string getLabelText() { return ""; };
|
||||||
@@ -149,6 +149,7 @@ class Choice: public ChoiceBase {
|
|||||||
void setTextHandler(std::function<std::string(int)> handler)
|
void setTextHandler(std::function<std::string(int)> handler)
|
||||||
{
|
{
|
||||||
textHandler = std::move(handler);
|
textHandler = std::move(handler);
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
void setMenuTitle(std::string value)
|
void setMenuTitle(std::string value)
|
||||||
|
|||||||
+5
-1
@@ -46,6 +46,7 @@ FileChoice::FileChoice(Window* parent, const rect_t &rect,
|
|||||||
setValue(std::move(setValue)),
|
setValue(std::move(setValue)),
|
||||||
stripExtension(stripExtension)
|
stripExtension(stripExtension)
|
||||||
{
|
{
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string FileChoice::getLabelText()
|
std::string FileChoice::getLabelText()
|
||||||
@@ -100,7 +101,10 @@ bool FileChoice::openMenu()
|
|||||||
int current = -1;
|
int current = -1;
|
||||||
std::string value = getValue();
|
std::string value = getValue();
|
||||||
for (const auto &file : files) {
|
for (const auto &file : files) {
|
||||||
menu->addLine(file, [=]() { setValue(file); });
|
menu->addLine(file, [=]() {
|
||||||
|
setValue(file);
|
||||||
|
lv_event_send(lvobj, LV_EVENT_VALUE_CHANGED, nullptr);
|
||||||
|
});
|
||||||
// TRACE("%s %d %s %d", value.c_str(), value.size(), file.c_str(),
|
// TRACE("%s %d %s %d", value.c_str(), value.size(), file.c_str(),
|
||||||
// file.size());
|
// file.size());
|
||||||
if (value.compare(file) == 0) {
|
if (value.compare(file) == 0) {
|
||||||
|
|||||||
Reference in New Issue
Block a user