diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 965ba40f8..f8d17fc99 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 965ba40f8b4dca7c1c52a4d7a5b3d42c991f5a96 +Subproject commit f8d17fc99949350e9820556b7445014e24c347f1 diff --git a/plugins/builtin/source/ui/pattern_drawer.cpp b/plugins/builtin/source/ui/pattern_drawer.cpp index 9a703c2a8..479d9065c 100644 --- a/plugins/builtin/source/ui/pattern_drawer.cpp +++ b/plugins/builtin/source/ui/pattern_drawer.cpp @@ -111,9 +111,7 @@ namespace hex::plugin::builtin::ui { if (pattern.isPatternLocal()) { ImGui::TextFormatted("[{}]", "hex.builtin.pattern_drawer.local"_lang); } else { - if (pattern.getSize() > 0) { - ImGui::TextFormatted("0x{0:08X}", pattern.getOffset()); - } + ImGui::TextFormatted("0x{0:08X}", pattern.getOffset()); } ImGui::TableNextColumn(); @@ -121,9 +119,7 @@ namespace hex::plugin::builtin::ui { if (pattern.isPatternLocal()) { ImGui::TextFormatted("[{}]", "hex.builtin.pattern_drawer.local"_lang); } else { - if (pattern.getSize() > 0) { - ImGui::TextFormatted("0x{0:08X}", pattern.getOffset() + pattern.getSize() - (pattern.getSize() == 0 ? 0 : 1)); - } + ImGui::TextFormatted("0x{0:08X}", pattern.getOffset() + pattern.getSize() - (pattern.getSize() == 0 ? 0 : 1)); } ImGui::TableNextColumn(); @@ -140,7 +136,7 @@ namespace hex::plugin::builtin::ui { void drawSizeColumn(const pl::ptrn::Pattern& pattern) { if (auto *bitfieldMember = dynamic_cast(&pattern); bitfieldMember != nullptr && bitfieldMember->getParentBitfield() != nullptr) drawSizeColumnForBitfieldMember(*bitfieldMember); - else if (pattern.getSize() > 0) + else ImGui::TextFormatted("0x{0:04X}", pattern.getSize()); ImGui::TableNextColumn();