From 491ee6aa2fa80081705a840927a1653aee6ef4a0 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 18 Aug 2022 23:51:50 +0200 Subject: [PATCH] patterns: Updated pattern language --- lib/external/pattern_language | 2 +- plugins/builtin/source/content/views/view_pattern_editor.cpp | 4 ++-- plugins/builtin/source/pattern_drawer.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 4e9492ee7..ed11c37fd 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 4e9492ee72a7d518de3bcad6308ea4e53148a365 +Subproject commit ed11c37fdfa6b6b0dcb90614bf88dbe49ece191f diff --git a/plugins/builtin/source/content/views/view_pattern_editor.cpp b/plugins/builtin/source/content/views/view_pattern_editor.cpp index 16e977e11..c181a5ed1 100644 --- a/plugins/builtin/source/content/views/view_pattern_editor.cpp +++ b/plugins/builtin/source/content/views/view_pattern_editor.cpp @@ -741,12 +741,12 @@ namespace hex::plugin::builtin { ImGui::TableNextColumn(); ImGui::TextFormatted("{}", pattern->getEndian() == std::endian::little ? "hex.builtin.common.little"_lang : "hex.builtin.common.big"_lang); - if (const auto &comment = pattern->getComment(); comment.has_value()) { + if (const auto &comment = pattern->getComment(); comment != nullptr) { ImGui::TableNextRow(); ImGui::TableNextColumn(); ImGui::TextFormatted("{}: ", "hex.builtin.common.comment"_lang); ImGui::TableNextColumn(); - ImGui::TextWrapped("\"%s\"", pattern->getComment()->c_str()); + ImGui::TextWrapped("\"%s\"", comment->c_str()); } ImGui::EndTable(); diff --git a/plugins/builtin/source/pattern_drawer.cpp b/plugins/builtin/source/pattern_drawer.cpp index d7fd6c863..f734bc871 100644 --- a/plugins/builtin/source/pattern_drawer.cpp +++ b/plugins/builtin/source/pattern_drawer.cpp @@ -277,7 +277,7 @@ namespace hex { void PatternDrawer::drawCommentTooltip(const pl::ptrn::Pattern &pattern) const { - if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && pattern.getComment().has_value()) { + if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenBlockedByActiveItem) && pattern.getComment() != nullptr) { ImGui::BeginTooltip(); ImGui::TextUnformatted(pattern.getComment()->c_str()); ImGui::EndTooltip();