From 173ed5475c5b9ab2eba6090882ed16518cceea89 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Fri, 31 Mar 2023 11:07:23 +0200 Subject: [PATCH] fix: Remove empty column when ASCII row is off and custom encoding is on Fixes #1005 --- plugins/builtin/source/ui/hex_editor.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/builtin/source/ui/hex_editor.cpp b/plugins/builtin/source/ui/hex_editor.cpp index 51b17db1c..0cad73e2f 100644 --- a/plugins/builtin/source/ui/hex_editor.cpp +++ b/plugins/builtin/source/ui/hex_editor.cpp @@ -341,7 +341,7 @@ namespace hex::plugin::builtin::ui { // ASCII column ImGui::TableSetupColumn(""); - ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, (CharacterSize.x + this->m_characterCellPadding * 1_scaled) * this->m_bytesPerRow); + ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed, this->m_showAscii ? (CharacterSize.x + this->m_characterCellPadding * 1_scaled) * this->m_bytesPerRow : 0); // Custom encoding column ImGui::TableSetupColumn(""); @@ -556,10 +556,9 @@ namespace hex::plugin::builtin::ui { ImGui::TableNextColumn(); const auto cellStartPos = getCellPosition(); - const auto cellSize = ImGui::CalcTextSize(data.displayValue.c_str()) * ImVec2(1, 0) + ImVec2(0, CharacterSize.y); + const auto cellSize = ImGui::CalcTextSize(data.displayValue.c_str()) * ImVec2(1, 0) + ImVec2(this->m_characterCellPadding * 1_scaled, CharacterSize.y); const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true); - const auto x = address % this->m_bytesPerRow; if (x < validBytes && isCurrRegionValid(address)) { auto [foregroundColor, backgroundColor] = cellColors[x / bytesPerCell];