Rooba
/
ImHex
mirror of https://github.com/WerWolv/ImHex.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: Improve byte displaying in bookmarks

This commit is contained in:
WerWolv 2021-08-28 01:47:26 +02:00
parent 3138d2c4a2
commit 8dcd5c6e34
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
source/views/view_bookmarks.cpp
View File

@ -68,27 +68,57 @@ namespace hex {
ImGui::PushStyleColor(ImGuiCol_Header, color); ImGui::PushStyleColor(ImGuiCol_Header, color);
ImGui::PushStyleColor(ImGuiCol_HeaderActive, color); ImGui::PushStyleColor(ImGuiCol_HeaderActive, color);
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, u32(hoverColor)); ImGui::PushStyleColor(ImGuiCol_HeaderHovered, u32(hoverColor));
if (ImGui::CollapsingHeader((std::string(name.data()) + "###" + std::to_string((u64)comment.data())).c_str())) { if (ImGui::CollapsingHeader(std::string(name.data()).c_str())) {
ImGui::TextUnformatted("hex.view.bookmarks.title.info"_lang); ImGui::TextUnformatted("hex.view.bookmarks.title.info"_lang);
ImGui::Separator(); ImGui::Separator();
ImGui::TextUnformatted(hex::format("hex.view.bookmarks.address"_lang, region.address, region.address + region.size - 1, region.size).c_str()); ImGui::TextUnformatted(hex::format("hex.view.bookmarks.address"_lang, region.address, region.address + region.size - 1, region.size).c_str());
if (ImGui::BeginChild("hexData", ImVec2(0, ImGui::GetTextLineHeight() * 8), true)) {
size_t offset = region.address % 0x10;
for (size_t byte = 0; byte < 0x10; byte++) {
ImGui::TextDisabled("%02X", byte);
ImGui::SameLine();
}
ImGui::NewLine();
// TODO: Clip this somehow
// First line
{ {
u8 bytes[10] = { 0 }; std::array<u8, 0x10> bytes = { 0 };
SharedData::currentProvider->read(region.address, bytes, std::min(region.size, size_t(10))); size_t byteCount = std::min<size_t>(0x10 - offset, region.size);
SharedData::currentProvider->read(region.address, bytes.data() + offset, byteCount);
std::string bytesString; for (size_t byte = 0; byte < 0x10; byte++) {
for (u8 i = 0; i < std::min(region.size, size_t(10)); i++) { if (byte < offset)
bytesString += hex::format("{0:02X} ", bytes[i]); ImGui::TextUnformatted(" ");
else
ImGui::Text("%02X", bytes[byte]);
ImGui::SameLine();
}
ImGui::NewLine();
} }
if (region.size > 10) { // Other lines
bytesString.pop_back(); {
bytesString += "..."; std::array<u8, 0x10> bytes = { 0 };
for (u32 i = 0x10 - offset; i < region.size; i += 0x10) {
size_t byteCount = std::min<size_t>(region.size - i, 0x10);
SharedData::currentProvider->read(region.address + i, bytes.data(), byteCount);
for (size_t byte = 0; byte < byteCount; byte++) {
ImGui::Text("%02X", bytes[byte]);
ImGui::SameLine();
}
ImGui::NewLine();
}
} }
ImGui::TextColored(ImColor(0xFF9BC64D), "%s", bytesString.c_str()); ImGui::EndChild();
} }
if (ImGui::Button("hex.view.bookmarks.button.jump"_lang)) if (ImGui::Button("hex.view.bookmarks.button.jump"_lang))
EventManager::post<RequestSelectionChange>(region); EventManager::post<RequestSelectionChange>(region);
ImGui::SameLine(0, 15); ImGui::SameLine(0, 15);