Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2024-11-28 09:30:51 +01:00
Code Releases Wiki Activity

pattern: Show array entries directly if there are less than 512

Browse Source
This commit is contained in:
WerWolv 2022-12-20 20:56:01 +01:00
parent ce37c795a7
commit 264da1ed78
3 changed files with 34 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/build_helpers.cmake
View File

@ -392,7 +392,7 @@ function(downloadImHexPatternsFiles dest)
)
message(STATUS "Downloading ImHex-Patterns repo branch ${PATTERNS_BRANCH}...")
FetchContent_Populate(imhex_patterns)
FetchContent_MakeAvailable(imhex_patterns)
message(STATUS "Finished downloading ImHex-Patterns")
else ()

2
lib/external/pattern_language vendored

@ -1 +1 @@
Subproject commit 48c36659e5c382ccf3e240a34e119fee0a0468cb
Subproject commit 73bd1725401abd12d494bb7211fa1e2ad1abfc80

16
plugins/builtin/source/ui/pattern_drawer.cpp
View File

@ -591,13 +591,13 @@ namespace hex::plugin::builtin::ui {
if (open) {
u64 chunkCount = 0;
for (u64 i = 0; i < iteratable.getEntryCount(); i += ChunkSize) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
chunkCount++;
auto &displayEnd = this->getDisplayEnd(pattern);
if (chunkCount > displayEnd) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
ImGui::Selectable(hex::format("... ({})", "hex.builtin.pattern_drawer.double_click"_lang).c_str(), false, ImGuiSelectableFlags_SpanAllColumns);
if (ImGui::IsItemHovered() && ImGui::IsMouseDoubleClicked(ImGuiMouseButton_Left))
displayEnd += DisplayEndStep;
@ -605,13 +605,18 @@ namespace hex::plugin::builtin::ui {
} else {
auto endIndex = std::min<u64>(iteratable.getEntryCount(), i + ChunkSize);
bool chunkOpen = true;
if (iteratable.getEntryCount() > ChunkSize) {
auto startOffset = iteratable.getEntry(i)->getOffset();
auto endOffset = iteratable.getEntry(endIndex - 1)->getOffset();
auto endSize = iteratable.getEntry(endIndex - 1)->getSize();
size_t chunkSize = (endOffset - startOffset) + endSize;
auto chunkOpen = highlightWhenSelected(startOffset, ((endOffset + endSize) - startOffset) - 1, [&]{ return ImGui::TreeNodeEx(hex::format("[{} ... {}]", i, endIndex - 1).c_str(), ImGuiTreeNodeFlags_SpanFullWidth); });
ImGui::TableNextRow();
ImGui::TableNextColumn();
chunkOpen = highlightWhenSelected(startOffset, ((endOffset + endSize) - startOffset) - 1, [&]{ return ImGui::TreeNodeEx(hex::format("[{} ... {}]", i, endIndex - 1).c_str(), ImGuiTreeNodeFlags_SpanFullWidth); });
ImGui::TableNextColumn();
drawColorColumn(pattern);
ImGui::TextFormatted("0x{0:08X} : 0x{1:08X}", startOffset, startOffset + chunkSize - (pattern.getSize() == 0 ? 0 : 1));
@ -629,6 +634,8 @@ namespace hex::plugin::builtin::ui {
ImGui::TableNextColumn();
ImGui::TextFormatted("[ ... ]");
}
if (chunkOpen) {
iteratable.forEachEntry(i, endIndex, [&](u64, auto *entry){
@ -637,6 +644,7 @@ namespace hex::plugin::builtin::ui {
ImGui::PopID();
});
if (iteratable.getEntryCount() > ChunkSize)
ImGui::TreePop();
}
}