From 60a178f75e2fd7cdb4f6c96a38f38daf12ed7016 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Sat, 28 Jan 2023 12:44:40 +0100 Subject: [PATCH] fix: Last column of diff view displaying all zeros Fixes #908 --- plugins/builtin/source/content/ui_items.cpp | 2 +- plugins/builtin/source/content/views/view_diff.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/builtin/source/content/ui_items.cpp b/plugins/builtin/source/content/ui_items.cpp index f8450ab98..fd9e46bd4 100644 --- a/plugins/builtin/source/content/ui_items.cpp +++ b/plugins/builtin/source/content/ui_items.cpp @@ -61,7 +61,7 @@ namespace hex::plugin::builtin { ImGui::EndPopup(); } - if (ImGui::BeginPopupModal("hex.builtin.popup.waiting_for_tasks.title"_lang, nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove)) { + if (ImGui::BeginPopupModal("hex.builtin.popup.waiting_for_tasks.title"_lang, nullptr, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoMove)) { ImGui::TextUnformatted("hex.builtin.popup.waiting_for_tasks.desc"_lang); ImGui::Separator(); diff --git a/plugins/builtin/source/content/views/view_diff.cpp b/plugins/builtin/source/content/views/view_diff.cpp index 1efce53c2..32c137bda 100644 --- a/plugins/builtin/source/content/views/view_diff.cpp +++ b/plugins/builtin/source/content/views/view_diff.cpp @@ -106,8 +106,8 @@ namespace hex::plugin::builtin { // Read one line of each provider lineInfo[i].bytes.resize(this->m_columnCount); - provider->read(row * this->m_columnCount, lineInfo[i].bytes.data(), lineInfo[i].bytes.size()); lineInfo[i].validBytes = std::min(this->m_columnCount, provider->getSize() - row * this->m_columnCount); + provider->read(row * this->m_columnCount, lineInfo[i].bytes.data(), lineInfo[i].validBytes); // Calculate address width u8 addressDigits = 0;