fix(color): manage models buttons incorrect after renaming or removing labels (#7705)

This commit is contained in:
philmoz
2026-08-25 12:06:53 +10:00
committed by GitHub
parent faa60953cb
commit 7f6bbd1fb9
2 changed files with 8 additions and 9 deletions
@@ -272,10 +272,15 @@ class ModelsPageBody : public Window
} }
} }
void reload() void clearButtons()
{ {
modelButtons.clear(); modelButtons.clear();
clear(); clear();
}
void reload()
{
clearButtons();
update(); update();
} }
@@ -840,6 +845,7 @@ void ModelLabelsWindow::buildBody(Window *window)
}); });
auto labels = getLabels(); auto labels = getLabels();
lblselector->setNames(labels); lblselector->setNames(labels);
mdlselector->clearButtons();
updateFilteredLabels(modelslabels.filteredLabels(), false); updateFilteredLabels(modelslabels.filteredLabels(), false);
} }
}); });
@@ -864,6 +870,7 @@ void ModelLabelsWindow::buildBody(Window *window)
lblselector->setSelected(newset); lblselector->setSelected(newset);
if (g_eeGeneral.labelSingleSelect && selected == lblselector->getActiveItem()) if (g_eeGeneral.labelSingleSelect && selected == lblselector->getActiveItem())
lblselector->setActiveItem(-1); lblselector->setActiveItem(-1);
mdlselector->clearButtons();
updateFilteredLabels(newset); updateFilteredLabels(newset);
}); });
return 0; return 0;
-8
View File
@@ -87,12 +87,6 @@ class ModelCell
bool fetchRfData(); bool fetchRfData();
}; };
typedef struct {
std::string icon;
// Anything else?
} SLabelDetail;
typedef std::vector<std::pair<uint16_t, ModelCell *>> ModelLabelsVector;
typedef std::vector<std::string> LabelsVector; typedef std::vector<std::string> LabelsVector;
typedef std::vector<ModelCell *> ModelsVector; typedef std::vector<ModelCell *> ModelsVector;
typedef enum { typedef enum {
@@ -249,7 +243,5 @@ class ModelsList : public ModelsVector
bool loadYamlDirScanner(); bool loadYamlDirScanner();
}; };
ModelLabelsVector getUniqueLabels();
extern ModelsList modelslist; extern ModelsList modelslist;
extern ModelMap modelslabels; extern ModelMap modelslabels;