From a0b2473bf4d530259b05e11598dfcd312949fcd4 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Mon, 5 Sep 2022 23:34:20 +0200 Subject: [PATCH] ui: Improved pattern color visualization --- lib/external/pattern_language | 2 +- plugins/builtin/source/pattern_drawer.cpp | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/lib/external/pattern_language b/lib/external/pattern_language index 3d5b3b058..3d6e86e9c 160000 --- a/lib/external/pattern_language +++ b/lib/external/pattern_language @@ -1 +1 @@ -Subproject commit 3d5b3b058978cbbfb4db5093d722f2073d36e955 +Subproject commit 3d6e86e9cfeac668465e20a969a1d4dd251cd34d diff --git a/plugins/builtin/source/pattern_drawer.cpp b/plugins/builtin/source/pattern_drawer.cpp index db5a8fe30..010c11f3a 100644 --- a/plugins/builtin/source/pattern_drawer.cpp +++ b/plugins/builtin/source/pattern_drawer.cpp @@ -80,8 +80,9 @@ namespace hex { open = createTreeNode(pattern); ImGui::TableNextColumn(); makeSelectable(pattern); + ImGui::SameLine(); drawCommentTooltip(pattern); - ImGui::TableNextColumn(); + drawColorColumn(pattern); drawOffsetColumn(pattern); drawSizeColumn(pattern); drawTypenameColumn(pattern, "bitfield"); @@ -185,7 +186,10 @@ namespace hex { ImGui::TableNextColumn(); makeSelectable(pattern); drawCommentTooltip(pattern); - ImGui::TableNextColumn(); + if (pattern.isSealed()) + drawColorColumn(pattern); + else + ImGui::TableNextColumn(); drawOffsetColumn(pattern); drawSizeColumn(pattern); drawTypenameColumn(pattern, "struct"); @@ -214,7 +218,10 @@ namespace hex { ImGui::TableNextColumn(); makeSelectable(pattern); drawCommentTooltip(pattern); - ImGui::TableNextColumn(); + if (pattern.isSealed()) + drawColorColumn(pattern); + else + ImGui::TableNextColumn(); drawOffsetColumn(pattern); drawSizeColumn(pattern); drawTypenameColumn(pattern, "union"); @@ -303,7 +310,10 @@ namespace hex { ImGui::TableNextColumn(); makeSelectable(pattern); drawCommentTooltip(pattern); - ImGui::TableNextColumn(); + if (pattern.isSealed()) + drawColorColumn(pattern); + else + ImGui::TableNextColumn(); drawOffsetColumn(pattern); drawSizeColumn(pattern); ImGui::TextFormattedColored(ImColor(0xFF9BC64D), "{0}", pattern.getTypeName());