Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-28 17:40:51 +01:00
Code Releases Wiki Activity

patterns: Fixed indentation of inlined variables

Browse Source
This commit is contained in:
WerWolv 2022-03-17 23:30:38 +01:00
parent a17b647e79
commit 11441d632b
6 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_array_dynamic.hpp
View File

@ -59,6 +59,9 @@ namespace hex::pl {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this)); ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
@ -77,7 +80,6 @@ namespace hex::pl {
} }
} }
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} else { } else {
this->m_displayEnd = 50; this->m_displayEnd = 50;

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_array_static.hpp
View File

@ -50,6 +50,9 @@ namespace hex::pl {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this)); ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
@ -72,7 +75,6 @@ namespace hex::pl {
} }
} }
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} else { } else {
this->m_displayEnd = 50; this->m_displayEnd = 50;

5
lib/libimhex/include/hex/pattern_language/patterns/pattern_bitfield.hpp
View File

@ -121,6 +121,9 @@ namespace hex::pl {
valueString += "}"; valueString += "}";
ImGui::TextFormatted("{}", this->formatDisplayValue(valueString, this)); ImGui::TextFormatted("{}", this->formatDisplayValue(valueString, this));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
@ -128,9 +131,9 @@ namespace hex::pl {
for (auto &field : this->m_fields) for (auto &field : this->m_fields)
field->draw(provider); field->draw(provider);
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} }
} }
void setOffset(u64 offset) override { void setOffset(u64 offset) override {

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_pointer.hpp
View File

@ -45,12 +45,14 @@ namespace hex::pl {
ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{}", this->getFormattedName()); ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{}", this->getFormattedName());
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextFormatted("{}", formatDisplayValue(hex::format("*(0x{0:X})", data), u128(data))); ImGui::TextFormatted("{}", formatDisplayValue(hex::format("*(0x{0:X})", data), u128(data)));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
this->m_pointedAt->createEntry(provider); this->m_pointedAt->createEntry(provider);
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} }
} }

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_struct.hpp
View File

@ -46,13 +46,15 @@ namespace hex::pl {
ImGui::TextUnformatted(this->getTypeName().c_str()); ImGui::TextUnformatted(this->getTypeName().c_str());
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this)); ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
for (auto &member : this->m_sortedMembers) for (auto &member : this->m_sortedMembers)
member->draw(provider); member->draw(provider);
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} }
} }

4
lib/libimhex/include/hex/pattern_language/patterns/pattern_union.hpp
View File

@ -47,13 +47,15 @@ namespace hex::pl {
ImGui::TableNextColumn(); ImGui::TableNextColumn();
ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this)); ImGui::TextFormatted("{}", this->formatDisplayValue("{ ... }", this));
} else {
ImGui::SameLine();
ImGui::TreeNodeEx("", ImGuiTreeNodeFlags_SpanFullWidth | ImGuiTreeNodeFlags_Leaf);
} }
if (open) { if (open) {
for (auto &member : this->m_sortedMembers) for (auto &member : this->m_sortedMembers)
member->draw(provider); member->draw(provider);
if (!this->isInlined())
ImGui::TreePop(); ImGui::TreePop();
} }
} }