Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-01-31 12:03:46 +01:00
Code Releases Wiki Activity

ui: Fixed columns in diffing view. (#441)

Browse Source
This commit is contained in:
twevs 2022-02-14 21:35:55 +01:00 committed by GitHub
parent 038b7961db
commit de86aee6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/builtin/source/content/views/view_diff.cpp
View File

@ -118,15 +118,16 @@ namespace hex::plugin::builtin {
auto startY = ImGui::GetCursorPosY();
ImGui::TableNextColumn();
ImGui::TextFormatted(this->m_upperCaseHex ? "{:0{}X}:" : "{:0{}x}:", row * this->m_columnCount, addressDigitCount);
ImGui::SetCursorPosY(startY);
ImGui::TableNextColumn();
const ImColor colorText = ImGui::GetColorU32(ImGuiCol_Text);
const ImColor colorDisabled = this->m_greyedOutZeros ? ImGui::GetColorU32(ImGuiCol_TextDisabled) : static_cast<u32>(colorText);
for (i8 curr = 0; curr < 2; curr++) {
ImGui::TableNextColumn();
auto other = !curr;
std::optional<ImVec2> lastHighlightEnd;
@ -167,7 +168,6 @@ namespace hex::plugin::builtin {
lastHighlightEnd.reset();
}
}
ImGui::TableNextColumn();
}
}
@ -202,11 +202,11 @@ namespace hex::plugin::builtin {
{
auto glyphWidth = ImGui::CalcTextSize("0").x + 1;
for (u8 i = 0; i < 2; i++) {
ImGui::TableNextColumn();
for (u32 col = 0; col < this->m_columnCount; col++) {
ImGui::TextFormatted(this->m_upperCaseHex ? "{:02X}" : "{:02x}", col);
ImGui::SameLine(0.0F, col % 8 == 7 ? glyphWidth * 1.5F : glyphWidth * 0.75F);
}
ImGui::TableNextColumn();
}
}
@ -219,7 +219,6 @@ namespace hex::plugin::builtin {
while (clipper.Step()) {
for (u64 row = clipper.DisplayStart; row < clipper.DisplayEnd; row++) {
ImGui::TableNextRow();
ImGui::TableNextColumn();
drawDiffLine({ this->m_providerA, this->m_providerB }, row);
}
}