imports/imhex
1
0
Fork 0
mirror of https://github.com/WerWolv/ImHex.git synced 2026-03-28 07:47:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

impr: Don't scroll hex editor view when jumping to a region that's on-screen already

Browse Source 
Fixes #1743
This commit is contained in:
WerWolv
2024-06-07 19:29:55 +02:00
parent ff20f81cfd
commit 6fd3fa77ed
3 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/builtin/include/content/views/view_hex_editor.hpp
View File

@@ -69,6 +69,10 @@ namespace hex::plugin::builtin {
m_hexEditor.jumpToSelection();
}
void jumpIfOffScreen() {
m_hexEditor.jumpIfOffScreen();
}
private:
void drawPopup();

16
plugins/builtin/source/content/views/view_hex_editor.cpp
View File

@@ -763,7 +763,6 @@ namespace hex::plugin::builtin {
if (cursor >= m_hexEditor.getBytesPerRow()) {
auto pos = cursor - m_hexEditor.getBytesPerRow();
this->setSelection(pos, pos);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
}
});
@@ -773,7 +772,6 @@ namespace hex::plugin::builtin {
auto pos = cursor + m_hexEditor.getBytesPerRow();
this->setSelection(pos, pos);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, Keys::Left, "hex.builtin.view.hex_editor.shortcut.cursor_left", [this] {
@@ -783,7 +781,6 @@ namespace hex::plugin::builtin {
if (cursor > 0) {
auto pos = cursor - m_hexEditor.getBytesPerCell();
this->setSelection(pos, pos);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
}
});
@@ -793,7 +790,6 @@ namespace hex::plugin::builtin {
auto pos = cursor + m_hexEditor.getBytesPerCell();
this->setSelection(pos, pos);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
@@ -805,7 +801,6 @@ namespace hex::plugin::builtin {
if (cursor >= visibleByteCount) {
auto pos = cursor - visibleByteCount;
this->setSelection(pos, (pos + m_hexEditor.getBytesPerCell()) - 1);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
}
});
@@ -815,7 +810,6 @@ namespace hex::plugin::builtin {
auto pos = cursor + (m_hexEditor.getBytesPerRow() * m_hexEditor.getVisibleRowCount());
this->setSelection(pos, (pos + m_hexEditor.getBytesPerCell()) - 1);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
@@ -825,7 +819,6 @@ namespace hex::plugin::builtin {
auto pos = cursor - cursor % m_hexEditor.getBytesPerRow();
this->setSelection(pos, (pos + m_hexEditor.getBytesPerCell()) - 1);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
@@ -835,7 +828,6 @@ namespace hex::plugin::builtin {
auto pos = cursor - cursor % m_hexEditor.getBytesPerRow() + m_hexEditor.getBytesPerRow() - m_hexEditor.getBytesPerCell();
this->setSelection(pos, (pos + m_hexEditor.getBytesPerCell()) - 1);
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
@@ -854,7 +846,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, SHIFT + Keys::Down, "hex.builtin.view.hex_editor.shortcut.selection_down", [this] {
@@ -871,7 +862,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, SHIFT + Keys::Left, "hex.builtin.view.hex_editor.shortcut.selection_left", [this] {
@@ -888,7 +878,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, SHIFT + Keys::Right, "hex.builtin.view.hex_editor.shortcut.selection_right", [this] {
@@ -905,7 +894,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, SHIFT + Keys::PageUp, "hex.builtin.view.hex_editor.shortcut.selection_page_up", [this] {
@@ -922,7 +910,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
ShortcutManager::addShortcut(this, SHIFT + Keys::PageDown, "hex.builtin.view.hex_editor.shortcut.selection_page_down", [this] {
@@ -939,7 +926,6 @@ namespace hex::plugin::builtin {
m_hexEditor.setCursorPosition(newCursor);
}
m_hexEditor.scrollToSelection();
m_hexEditor.jumpIfOffScreen();
});
@@ -964,7 +950,7 @@ namespace hex::plugin::builtin {
if (region.size != 0) {
provider->setCurrentPage(page.value());
this->setSelection(region);
this->jumpToSelection();
this->jumpIfOffScreen();
}
});

1
plugins/ui/include/ui/hex_editor.hpp
View File

@@ -196,6 +196,7 @@ namespace hex::ui {
}
void jumpIfOffScreen() {
m_shouldScrollToSelection = true;
m_shouldJumpWhenOffScreen = true;
}