Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-21 12:29:47 +01:00
Code Releases Wiki Activity

fix: Build because i64 is not the same as ImS64 somehow

Browse Source
This commit is contained in:
WerWolv 2023-12-22 21:34:11 +01:00
parent ec64952cb4
commit 538e79183c
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/builtin/include/ui/hex_editor.hpp
View File

@ -230,7 +230,7 @@ namespace hex::plugin::builtin::ui {
std::optional<u64> m_selectionStart; std::optional<u64> m_selectionStart;
std::optional<u64> m_selectionEnd; std::optional<u64> m_selectionEnd;
std::optional<u64> m_cursorPosition; std::optional<u64> m_cursorPosition;
i64 m_scrollPosition = 0; ImS64 m_scrollPosition = 0;
u16 m_bytesPerRow = 16; u16 m_bytesPerRow = 16;
std::endian m_dataVisualizerEndianness = std::endian::little; std::endian m_dataVisualizerEndianness = std::endian::little;

12
plugins/builtin/source/ui/hex_editor.cpp
View File

@ -320,7 +320,7 @@ namespace hex::plugin::builtin::ui {
{ {
const auto window = ImGui::GetCurrentWindowRead(); const auto window = ImGui::GetCurrentWindowRead();
const auto axis = ImGuiAxis_Y; const auto axis = ImGuiAxis_Y;
i64 numRows = (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1); ImS64 numRows = (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1);
const auto outerRect = window->Rect(); const auto outerRect = window->Rect();
const auto innerRect = window->InnerRect; const auto innerRect = window->InnerRect;
@ -338,7 +338,7 @@ namespace hex::plugin::builtin::ui {
roundingCorners); roundingCorners);
if (ImGui::IsWindowHovered()) { if (ImGui::IsWindowHovered()) {
m_scrollPosition += i64(ImGui::GetIO().MouseWheel * -5); m_scrollPosition += ImS64(ImGui::GetIO().MouseWheel * -5);
} }
if (m_scrollPosition < 0) if (m_scrollPosition < 0)
@ -403,7 +403,7 @@ namespace hex::plugin::builtin::ui {
return currRegionValid; return currRegionValid;
}; };
i64 numRows = (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1); ImS64 numRows = (m_provider->getSize() / m_bytesPerRow) + ((m_provider->getSize() % m_bytesPerRow) == 0 ? 0 : 1);
if (numRows == 0) { if (numRows == 0) {
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -413,7 +413,7 @@ namespace hex::plugin::builtin::ui {
m_visibleRowCount = ImGui::GetWindowSize().y / CharacterSize.y; m_visibleRowCount = ImGui::GetWindowSize().y / CharacterSize.y;
// Loop over rows // Loop over rows
for (i64 y = m_scrollPosition; y < (m_scrollPosition + m_visibleRowCount + 5) && y < numRows; y++) { for (ImS64 y = m_scrollPosition; y < (m_scrollPosition + m_visibleRowCount + 5) && y < numRows; y++) {
// Draw address column // Draw address column
ImGui::TableNextRow(); ImGui::TableNextRow();
ImGui::TableNextColumn(); ImGui::TableNextColumn();
@ -648,12 +648,12 @@ namespace hex::plugin::builtin::ui {
// Make sure simply clicking on a byte at the edge of the screen won't cause scrolling // Make sure simply clicking on a byte at the edge of the screen won't cause scrolling
if ((ImGui::IsMouseDragging(ImGuiMouseButton_Left) && *m_selectionStart != *m_selectionEnd)) { if ((ImGui::IsMouseDragging(ImGuiMouseButton_Left) && *m_selectionStart != *m_selectionEnd)) {
if (y == (m_scrollPosition + 3)) { if (y == (m_scrollPosition + 3)) {
if (i128(m_selectionEnd.value() - m_provider->getBaseAddress() - m_provider->getCurrentPageAddress()) <= (i64(m_scrollPosition + 3) * m_bytesPerRow)) { if (i128(m_selectionEnd.value() - m_provider->getBaseAddress() - m_provider->getCurrentPageAddress()) <= (ImS64(m_scrollPosition + 3) * m_bytesPerRow)) {
m_shouldScrollToSelection = false; m_shouldScrollToSelection = false;
m_scrollPosition -= 3; m_scrollPosition -= 3;
} }
} else if (y == ((m_scrollPosition + m_visibleRowCount) - 1)) { } else if (y == ((m_scrollPosition + m_visibleRowCount) - 1)) {
if (i128(m_selectionEnd.value() - m_provider->getBaseAddress() - m_provider->getCurrentPageAddress()) >= (i64((m_scrollPosition + m_visibleRowCount) - 2) * m_bytesPerRow)) { if (i128(m_selectionEnd.value() - m_provider->getBaseAddress() - m_provider->getCurrentPageAddress()) >= (ImS64((m_scrollPosition + m_visibleRowCount) - 2) * m_bytesPerRow)) {
m_shouldScrollToSelection = false; m_shouldScrollToSelection = false;
m_scrollPosition += 3; m_scrollPosition += 3;
} }