imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-30 05:05:19 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: RGBA8 hex editor data visualizer not working correctly

Browse Source
This commit is contained in:
WerWolv
2023-12-19 23:20:56 +01:00
parent 96db2074c6
commit a6025e72fb
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/builtin/source/ui/hex_editor.cpp
View File

@@ -5,6 +5,7 @@
#include <hex/helpers/encoding_file.hpp>
#include <hex/helpers/utils.hpp>
#include <wolv/utils/guards.hpp>
namespace hex::plugin::builtin::ui {
@@ -197,8 +198,10 @@ namespace hex::plugin::builtin::ui {
}
}
else {
ImGui::SetKeyboardFocusHere();
ImGui::SetNextFrameWantCaptureKeyboard(true);
if (m_enteredEditingMode) {
ImGui::SetKeyboardFocusHere();
ImGui::SetNextFrameWantCaptureKeyboard(true);
}
bool shouldExitEditingMode = true;
if (cellType == m_editingCellType && cellType == CellType::Hex) {
@@ -225,7 +228,7 @@ namespace hex::plugin::builtin::ui {
size_t writtenBytes = 0;
for (size_t i = 0; i < m_editingBytes.size(); i += 1) {
if (m_editingBytes[i] != oldData[i]) {
m_provider->write(*m_editingAddress, &m_editingBytes[i], 1);
m_provider->write(*m_editingAddress + i, &m_editingBytes[i], 1);
writtenBytes += 1;
}
}
@@ -250,7 +253,7 @@ namespace hex::plugin::builtin::ui {
m_shouldUpdateEditingValue = true;
}
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !hovered && !m_enteredEditingMode) {
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !hovered && !m_enteredEditingMode && !ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopup)) {
m_editingAddress = std::nullopt;
m_shouldModifyValue = false;
}
@@ -472,8 +475,12 @@ namespace hex::plugin::builtin::ui {
this->handleSelection(byteAddress, bytesPerCell, &bytes[x * bytesPerCell], cellHovered);
// Get byte foreground color
if (foregroundColor.has_value())
auto popForeground = SCOPE_GUARD { ImGui::PopStyleColor(); };
if (foregroundColor.has_value() && !m_editingAddress.has_value())
ImGui::PushStyleColor(ImGuiCol_Text, *foregroundColor);
else
popForeground.release();
// Draw cell content
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
@@ -484,9 +491,6 @@ namespace hex::plugin::builtin::ui {
ImGuiExt::TextFormatted("{}", std::string(maxCharsPerCell, '?'));
ImGui::PopItemWidth();
ImGui::PopStyleVar();
if (foregroundColor.has_value())
ImGui::PopStyleColor();
}
}
ImGui::PopStyleVar();
@@ -925,4 +929,4 @@ namespace hex::plugin::builtin::ui {
m_selectionChanged = false;
}
}
}