Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-12-01 02:37:18 +01:00
Code Releases Wiki Activity

patterns: Fixed arrays overriding the color of all its entries

Browse Source
This commit is contained in:
WerWolv 2022-01-12 12:51:29 +01:00
parent a7a57e2bd0
commit 0d02af3cf0
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/libimhex/include/hex/pattern_language/ast_node.hpp
View File

@ -966,7 +966,6 @@ namespace hex::pl {
auto addEntry = [&](PatternData *pattern) { auto addEntry = [&](PatternData *pattern) {
pattern->setVariableName(hex::format("[{}]", entryIndex)); pattern->setVariableName(hex::format("[{}]", entryIndex));
pattern->setEndian(arrayPattern->getEndian()); pattern->setEndian(arrayPattern->getEndian());
pattern->setColor(arrayPattern->getColor());
entries.push_back(pattern); entries.push_back(pattern);
size += pattern->getSize(); size += pattern->getSize();

13
plugins/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -88,6 +88,7 @@ namespace hex::pl {
return; return;
this->m_color = Palette[SharedData::patternPaletteOffset++]; this->m_color = Palette[SharedData::patternPaletteOffset++];
this->m_manualColor = false;
if (SharedData::patternPaletteOffset >= (sizeof(Palette) / sizeof(u32))) if (SharedData::patternPaletteOffset >= (sizeof(Palette) / sizeof(u32)))
SharedData::patternPaletteOffset = 0; SharedData::patternPaletteOffset = 0;
@ -115,7 +116,8 @@ namespace hex::pl {
void setTypeName(std::string name) { this->m_typeName = std::move(name); } void setTypeName(std::string name) { this->m_typeName = std::move(name); }
[[nodiscard]] u32 getColor() const { return this->m_color; } [[nodiscard]] u32 getColor() const { return this->m_color; }
virtual void setColor(u32 color) { this->m_color = color; } virtual void setColor(u32 color) { this->m_color = color; this->m_manualColor = true; }
[[nodiscard]] bool hasOverriddenColor() const { return this->m_manualColor; }
[[nodiscard]] std::endian getEndian() const { return this->m_endian; } [[nodiscard]] std::endian getEndian() const { return this->m_endian; }
void setEndian(std::endian endian) { this->m_endian = endian; } void setEndian(std::endian endian) { this->m_endian = endian; }
@ -314,6 +316,7 @@ namespace hex::pl {
std::optional<ContentRegistry::PatternLanguage::Function> m_transformFunction; std::optional<ContentRegistry::PatternLanguage::Function> m_transformFunction;
bool m_local = false; bool m_local = false;
bool m_manualColor = false;
}; };
class PatternDataPadding : public PatternData { class PatternDataPadding : public PatternData {
@ -825,8 +828,10 @@ namespace hex::pl {
void setEntries(const std::vector<PatternData*> &entries) { void setEntries(const std::vector<PatternData*> &entries) {
this->m_entries = entries; this->m_entries = entries;
for (auto &entry : this->m_entries) { if (this->hasOverriddenColor()) {
entry->setColor(this->getColor()); for (auto &entry : this->m_entries) {
entry->setColor(this->getColor());
}
} }
} }
@ -966,7 +971,7 @@ namespace hex::pl {
this->m_template = templ; this->m_template = templ;
this->m_entryCount = count; this->m_entryCount = count;
this->setColor(this->m_template->getColor()); if (this->hasOverriddenColor()) this->setColor(this->m_template->getColor());
this->m_template->setEndian(templ->getEndian()); this->m_template->setEndian(templ->getEndian());
} }