Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-09-25 20:18:26 +02:00
Code Releases Wiki Activity

pattern: Fixed color overriding of struct members when struct has a color set already

Browse Source 
Fixes #409
This commit is contained in:
WerWolv 2022-01-29 22:17:51 +01:00
parent 362413dbe7
commit bfa3538745
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libimhex/include/hex/pattern_language/pattern_data.hpp
View File

@ -1145,8 +1145,10 @@ namespace hex::pl {
void setColor(u32 color) override { void setColor(u32 color) override {
PatternData::setColor(color); PatternData::setColor(color);
for (auto &member : this->m_members) for (auto &member : this->m_members) {
member->setColor(color); if (!member->hasOverriddenColor())
member->setColor(color);
}
} }
void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override { void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {
@ -1291,8 +1293,10 @@ namespace hex::pl {
void setColor(u32 color) override { void setColor(u32 color) override {
PatternData::setColor(color); PatternData::setColor(color);
for (auto &member : this->m_members) for (auto &member : this->m_members) {
member->setColor(color); if (!member->hasOverriddenColor())
member->setColor(color);
}
} }
void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override { void sort(ImGuiTableSortSpecs *sortSpecs, prv::Provider *provider) override {

2
lib/libimhex/source/pattern_language/parser.cpp
View File

@ -880,7 +880,7 @@ namespace hex::pl {
if (!isFunction) { if (!isFunction) {
auto type = parseType(); auto type = parseType();
if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN)) && sequence<Not>(SEPARATOR_SQUAREBRACKETOPEN)) if (MATCHES(sequence(IDENTIFIER, SEPARATOR_SQUAREBRACKETOPEN) && sequence<Not>(SEPARATOR_SQUAREBRACKETOPEN)))
member = parseMemberArrayVariable(type); member = parseMemberArrayVariable(type);
else if (MATCHES(sequence(IDENTIFIER))) else if (MATCHES(sequence(IDENTIFIER)))
member = parseMemberVariable(type); member = parseMemberVariable(type);