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

patterns: Fixed selection of static array entries

Browse Source
This commit is contained in:
WerWolv
2022-04-07 12:59:23 +02:00
parent 76f732dc53
commit 942a4e9616
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/libimhex/include/hex/pattern_language/pattern_drawer.hpp
View File

@@ -338,7 +338,6 @@ namespace hex::pl {
}
static void makeSelectable(const Pattern &pattern) {
ImGui::PushID(&pattern);
ImGui::PushID(static_cast<int>(pattern.getOffset()));
ImGui::PushID(pattern.getVariableName().c_str());
if (ImGui::Selectable("##PatternLine", false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
@@ -347,7 +346,6 @@ namespace hex::pl {
ImGui::SameLine();
ImGui::PopID();
ImGui::PopID();
ImGui::PopID();
}
static void drawCommentTooltip(const Pattern &pattern) {
@@ -376,9 +374,7 @@ namespace hex::pl {
ImGui::TableNextColumn();
open = createTreeNode(pattern);
ImGui::TableNextColumn();
if (ImGui::Selectable(("##PatternLine"s + std::to_string(u64(&pattern))).c_str(), false, ImGuiSelectableFlags_SpanAllColumns | ImGuiSelectableFlags_AllowItemOverlap)) {
ImHexApi::HexEditor::setSelection(pattern.getOffset(), pattern.getSize());
}
makeSelectable(pattern);
drawCommentTooltip(pattern);
ImGui::TableNextColumn();
drawOffsetColumn(pattern);
@@ -403,6 +399,9 @@ namespace hex::pl {
if (open) {
pattern.forEachArrayEntry([&] (u64 idx, auto &entry){
u64 lastVisible = displayEnd - 1;
ImGui::PushID(entry.getOffset());
if (idx < lastVisible) {
this->draw(entry);
} else if (idx == lastVisible) {
@@ -413,6 +412,8 @@ namespace hex::pl {
if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
displayEnd += DisplayEndStep;
}
ImGui::PopID();
});
ImGui::TreePop();