Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-06 14:14:22 +01:00
Code Releases Wiki Activity

fix: Parent hover setting name being wrong

Browse Source
This commit is contained in:
WerWolv 2024-02-25 14:38:26 +01:00
parent 29c7b342eb
commit 491e2dfe56
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@ -1837,7 +1837,7 @@ namespace hex::plugin::builtin {
} }
}); });
ContentRegistry::Settings::onChange("hex.builtin.setting.interface", "hex.builtin.setting.interface.parent_highlighting", [this](const ContentRegistry::Settings::SettingsValue &value) { ContentRegistry::Settings::onChange("hex.builtin.setting.hex_editor", "hex.builtin.setting.hex_editor.pattern_parent_highlighting", [this](const ContentRegistry::Settings::SettingsValue &value) {
m_parentHighlightingEnabled = bool(value.get<int>(false)); m_parentHighlightingEnabled = bool(value.get<int>(false));
}); });

6
plugins/ui/source/ui/hex_editor.cpp
View File

@ -580,7 +580,7 @@ namespace hex::ui {
this->drawSelectionFrame(x, y, selection, byteAddress, bytesPerCell, cellStartPos, cellSize, backgroundColor.value()); this->drawSelectionFrame(x, y, selection, byteAddress, bytesPerCell, cellStartPos, cellSize, backgroundColor.value());
} }
const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, false); const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, false) && ImGui::IsWindowHovered();
this->handleSelection(byteAddress, bytesPerCell, &bytes[x * bytesPerCell], cellHovered); this->handleSelection(byteAddress, bytesPerCell, &bytes[x * bytesPerCell], cellHovered);
@ -629,7 +629,7 @@ namespace hex::ui {
const auto cellStartPos = getCellPosition(); const auto cellStartPos = getCellPosition();
const auto cellSize = CharacterSize + scaled(ImVec2(m_characterCellPadding, 0)); const auto cellSize = CharacterSize + scaled(ImVec2(m_characterCellPadding, 0));
const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true); const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true) && ImGui::IsWindowHovered();
if (x < validBytes) { if (x < validBytes) {
this->handleSelection(byteAddress, bytesPerCell, &bytes[x], cellHovered); this->handleSelection(byteAddress, bytesPerCell, &bytes[x], cellHovered);
@ -725,7 +725,7 @@ namespace hex::ui {
const auto cellStartPos = getCellPosition(); const auto cellStartPos = getCellPosition();
const auto cellSize = ImGui::CalcTextSize(data.displayValue.c_str()) * ImVec2(1, 0) + ImVec2(m_characterCellPadding * 1_scaled, CharacterSize.y); const auto cellSize = ImGui::CalcTextSize(data.displayValue.c_str()) * ImVec2(1, 0) + ImVec2(m_characterCellPadding * 1_scaled, CharacterSize.y);
const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true); const bool cellHovered = ImGui::IsMouseHoveringRect(cellStartPos, cellStartPos + cellSize, true) && ImGui::IsWindowHovered();
const auto x = address % m_bytesPerRow; const auto x = address % m_bytesPerRow;
if (x < validBytes && isCurrRegionValid(address)) { if (x < validBytes && isCurrRegionValid(address)) {