imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-04-02 05:27:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Allow custom encodings with only single-byte characters to be displayed immediately

Browse Source
This commit is contained in:
WerWolv
2024-01-27 16:49:31 +01:00
parent 25b4745997
commit 61048757e6
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -592,14 +592,12 @@ namespace hex::ui {
m_encodingLineStartAddresses.push_back(0);
}
if (size_t(y) < m_encodingLineStartAddresses.size()) {
const bool singleByteEncoding = m_currCustomEncoding->getLongestSequence() == 1 && m_currCustomEncoding->getShortestSequence() == 1;
if (size_t(y) < m_encodingLineStartAddresses.size() || singleByteEncoding) {
std::vector<std::pair<u64, CustomEncodingData>> encodingData;
if (m_encodingLineStartAddresses[y] >= m_bytesPerRow) {
encodingData.emplace_back(y * m_bytesPerRow + m_provider->getBaseAddress() + m_provider->getCurrentPageAddress(), CustomEncodingData(".", 1, ImGuiExt::GetCustomColorU32(ImGuiCustomCol_AdvancedEncodingUnknown)));
m_encodingLineStartAddresses.push_back(0);
} else {
u32 offset = m_encodingLineStartAddresses[y];
if (singleByteEncoding) {
u64 offset = 0;
do {
const u64 address = y * m_bytesPerRow + offset + m_provider->getBaseAddress() + m_provider->getCurrentPageAddress();
@@ -608,8 +606,23 @@ namespace hex::ui {
offset += result.advance;
encodingData.emplace_back(address, result);
} while (offset < m_bytesPerRow);
} else {
if (m_encodingLineStartAddresses[y] >= m_bytesPerRow) {
encodingData.emplace_back(y * m_bytesPerRow + m_provider->getBaseAddress() + m_provider->getCurrentPageAddress(), CustomEncodingData(".", 1, ImGuiExt::GetCustomColorU32(ImGuiCustomCol_AdvancedEncodingUnknown)));
m_encodingLineStartAddresses.push_back(0);
} else {
u64 offset = m_encodingLineStartAddresses[y];
do {
const u64 address = y * m_bytesPerRow + offset + m_provider->getBaseAddress() + m_provider->getCurrentPageAddress();
m_encodingLineStartAddresses.push_back(offset - m_bytesPerRow);
auto result = queryCustomEncodingData(m_provider, *m_currCustomEncoding, address);
offset += result.advance;
encodingData.emplace_back(address, result);
} while (offset < m_bytesPerRow);
m_encodingLineStartAddresses.push_back(offset - m_bytesPerRow);
}
}
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding, ImVec2(0, 0));