fix(color): manage models buttons incorrect after renaming or removing labels (#7705)
This commit is contained in:
@@ -272,10 +272,15 @@ class ModelsPageBody : public Window
|
||||
}
|
||||
}
|
||||
|
||||
void reload()
|
||||
void clearButtons()
|
||||
{
|
||||
modelButtons.clear();
|
||||
clear();
|
||||
}
|
||||
|
||||
void reload()
|
||||
{
|
||||
clearButtons();
|
||||
update();
|
||||
}
|
||||
|
||||
@@ -840,6 +845,7 @@ void ModelLabelsWindow::buildBody(Window *window)
|
||||
});
|
||||
auto labels = getLabels();
|
||||
lblselector->setNames(labels);
|
||||
mdlselector->clearButtons();
|
||||
updateFilteredLabels(modelslabels.filteredLabels(), false);
|
||||
}
|
||||
});
|
||||
@@ -864,6 +870,7 @@ void ModelLabelsWindow::buildBody(Window *window)
|
||||
lblselector->setSelected(newset);
|
||||
if (g_eeGeneral.labelSingleSelect && selected == lblselector->getActiveItem())
|
||||
lblselector->setActiveItem(-1);
|
||||
mdlselector->clearButtons();
|
||||
updateFilteredLabels(newset);
|
||||
});
|
||||
return 0;
|
||||
|
||||
@@ -87,12 +87,6 @@ class ModelCell
|
||||
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<ModelCell *> ModelsVector;
|
||||
typedef enum {
|
||||
@@ -249,7 +243,5 @@ class ModelsList : public ModelsVector
|
||||
bool loadYamlDirScanner();
|
||||
};
|
||||
|
||||
ModelLabelsVector getUniqueLabels();
|
||||
|
||||
extern ModelsList modelslist;
|
||||
extern ModelMap modelslabels;
|
||||
|
||||
Reference in New Issue
Block a user