development/ImHex
development/ImHex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex synced 2024-10-19 09:12:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Exit hex editor editing mode when right clicking

Browse source 
Fixes #1499
This commit is contained in:
WerWolv 2024-01-27 13:41:38 +01:00
parent 44510b5b64
commit 5747b72a41
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/ui/source/ui/hex_editor.cpp
View file

@ -212,6 +212,11 @@ namespace hex::ui {
ImGui::SetNextFrameWantCaptureKeyboard(true);
}
const auto anyMouseButtonClicked =
ImGui::IsMouseClicked(ImGuiMouseButton_Left) ||
ImGui::IsMouseClicked(ImGuiMouseButton_Middle) ||
ImGui::IsMouseClicked(ImGuiMouseButton_Right);
if (shouldExitEditingMode || m_shouldModifyValue) {
{
std::vector<u8> oldData(m_editingBytes.size());
@ -228,8 +233,7 @@ namespace hex::ui {
m_provider->getUndoStack().groupOperations(writtenBytes, "hex.builtin.undo_operation.modification");
}
if (!m_selectionChanged && !ImGui::IsMouseDown(ImGuiMouseButton_Left) && !ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !ImGui::IsKeyDown(ImGuiKey_Escape)) {
if (!m_selectionChanged && !ImGui::IsMouseDown(ImGuiMouseButton_Left) && !anyMouseButtonClicked && !ImGui::IsKeyDown(ImGuiKey_Escape)) {
auto nextEditingAddress = *m_editingAddress + m_currDataVisualizer->getBytesPerCell();
this->setSelection(nextEditingAddress, nextEditingAddress);
@ -245,9 +249,11 @@ namespace hex::ui {
m_shouldUpdateEditingValue = true;
}
if (ImGui::IsMouseClicked(ImGuiMouseButton_Left) && !hovered && !m_enteredEditingMode && !ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopup)) {
m_editingAddress = std::nullopt;
m_shouldModifyValue = false;
if (anyMouseButtonClicked && !m_enteredEditingMode && !ImGui::IsPopupOpen("", ImGuiPopupFlags_AnyPopup)) {
if (!(ImGui::IsMouseClicked(ImGuiMouseButton_Left) && hovered)) {
m_editingAddress = std::nullopt;
m_shouldModifyValue = false;
}
}
if (!m_editingAddress.has_value())