Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-24 15:50:16 +01:00
Code Releases Wiki Activity

fix: Broken editing view column rendering in pattern drawer

Browse Source
This commit is contained in:
WerWolv 2024-02-12 19:40:21 +01:00
parent 588f8af966
commit 03beca1099
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/ui/source/ui/pattern_drawer.cpp
View File

@ -466,6 +466,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -548,6 +549,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -569,6 +571,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
auto value = hex::encodeByteString(pattern.getBytes()); auto value = hex::encodeByteString(pattern.getBytes());
@ -598,6 +601,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -631,6 +635,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -683,6 +688,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -710,6 +716,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
@ -741,6 +748,7 @@ namespace hex::ui {
drawTypeNameColumn(pattern, "struct"); drawTypeNameColumn(pattern, "struct");
if (this->isEditingPattern(pattern) && !pattern.getWriteFormatterFunction().empty()) { if (this->isEditingPattern(pattern) && !pattern.getWriteFormatterFunction().empty()) {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
auto value = pattern.toString(); auto value = pattern.toString();
@ -786,6 +794,7 @@ namespace hex::ui {
drawTypeNameColumn(pattern, "union"); drawTypeNameColumn(pattern, "union");
if (this->isEditingPattern(pattern) && !pattern.getWriteFormatterFunction().empty()) { if (this->isEditingPattern(pattern) && !pattern.getWriteFormatterFunction().empty()) {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
auto value = pattern.toString(); auto value = pattern.toString();
@ -824,6 +833,7 @@ namespace hex::ui {
if (!this->isEditingPattern(pattern)) { if (!this->isEditingPattern(pattern)) {
drawValueColumn(pattern); drawValueColumn(pattern);
} else { } else {
ImGui::TableNextColumn();
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0)); ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x); ImGui::PushItemWidth(ImGui::GetContentRegionAvail().x);
auto value = pattern.toString(); auto value = pattern.toString();