Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-30 19:43:43 +01:00
Code Releases Wiki Activity

pattern: Make sure hidden variables don't get highlighted anymore

Browse Source
This commit is contained in:
WerWolv 2022-01-22 15:46:39 +01:00
parent 42eea8ffba
commit d5d1577b43
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
virtual const PatternData* getPattern(u64 offset) const { virtual const PatternData* getPattern(u64 offset) const {
if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize())) if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize()) && !this->isHidden())
return this; return this;
else else
return nullptr; return nullptr;
@ -446,7 +446,7 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
const PatternData* getPattern(u64 offset) const override { const PatternData* getPattern(u64 offset) const override {
if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize())) if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize()) && !this->isHidden())
return this; return this;
else else
return this->m_pointedAt->getPattern(offset); return this->m_pointedAt->getPattern(offset);
@ -868,6 +868,8 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
const PatternData* getPattern(u64 offset) const override { const PatternData* getPattern(u64 offset) const override {
if (this->isHidden()) return nullptr;
auto iter = std::find_if(this->m_entries.begin(), this->m_entries.end(), [this, offset](PatternData *pattern){ auto iter = std::find_if(this->m_entries.begin(), this->m_entries.end(), [this, offset](PatternData *pattern){
return offset >= pattern->getOffset() && offset < (pattern->getOffset() + pattern->getSize()); return offset >= pattern->getOffset() && offset < (pattern->getOffset() + pattern->getSize());
}); });
@ -1017,6 +1019,8 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
const PatternData* getPattern(u64 offset) const override { const PatternData* getPattern(u64 offset) const override {
if (this->isHidden()) return nullptr;
if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize())) { if (offset >= this->getOffset() && offset < (this->getOffset() + this->getSize())) {
this->m_highlightTemplate->setOffset((offset / this->m_highlightTemplate->getSize()) * this->m_highlightTemplate->getSize()); this->m_highlightTemplate->setOffset((offset / this->m_highlightTemplate->getSize()) * this->m_highlightTemplate->getSize());
return this->m_highlightTemplate->getPattern(offset); return this->m_highlightTemplate->getPattern(offset);
@ -1150,6 +1154,7 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
const PatternData* getPattern(u64 offset) const override { const PatternData* getPattern(u64 offset) const override {
if (this->isHidden()) return nullptr;
auto iter = std::find_if(this->m_members.begin(), this->m_members.end(), [offset](PatternData *pattern){ auto iter = std::find_if(this->m_members.begin(), this->m_members.end(), [offset](PatternData *pattern){
return offset >= pattern->getOffset() && offset < (pattern->getOffset() + pattern->getSize()); return offset >= pattern->getOffset() && offset < (pattern->getOffset() + pattern->getSize());
@ -1285,6 +1290,7 @@ namespace hex::pl {
[[nodiscard]] [[nodiscard]]
const PatternData* getPattern(u64 offset) const override { const PatternData* getPattern(u64 offset) const override {
if (this->isHidden()) return nullptr;
auto largestMember = std::find_if(this->m_members.begin(), this->m_members.end(), [this](PatternData *pattern) { auto largestMember = std::find_if(this->m_members.begin(), this->m_members.end(), [this](PatternData *pattern) {
return pattern->getSize() == this->getSize(); return pattern->getSize() == this->getSize();