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

fix: Pattern Editor Find and Replace history (#2064)

Browse Source 
The previous implementation seems to have been broken by Imgui updates. 

There is also some improvement in focus handling and also a bug in
replace where the last match was not being replaced has been fixed.

Fixed also slowdown in large files when only one char was typed by not
searching until enter has been pressed.

Added key repetitions for enter and arrows to be able to handle large
number of matches and fixed some formatting problems.
This commit is contained in:
paxcut
2025-01-15 11:40:12 -07:00
committed by GitHub
parent 8abaafab79
commit 1e17422f5e
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
plugins/builtin/source/content/views/view_pattern_editor.cpp
View File

@@ -694,16 +694,7 @@ namespace hex::plugin::builtin {
ImGui::TableNextColumn();
static int findFlags = ImGuiInputTextFlags_None;
if (requestFocus && m_findHistoryIndex == m_findHistorySize)
findFlags |= ImGuiInputTextFlags_AutoSelectAll;
else
findFlags &= ~ImGuiInputTextFlags_AutoSelectAll;
if (m_findHistoryIndex != m_findHistorySize && requestFocusFind ) {
findFlags |= ImGuiInputTextFlags_ReadOnly;
} else
findFlags &= ~ImGuiInputTextFlags_ReadOnly;
static int findFlags = ImGuiInputTextFlags_EnterReturnsTrue;
std::string hint = "hex.builtin.view.pattern_editor.find_hint"_lang.operator std::string();
if (m_findHistorySize > 0) {
@@ -739,6 +730,8 @@ namespace hex::plugin::builtin {
findWord = m_findHistory[m_findHistoryIndex];
findReplaceHandler->SetFindWord(textEditor,findWord);
position = findReplaceHandler->FindPosition(textEditor,textEditor->GetCursorPosition(), true);
if (ImGuiInputTextState* input_state = ImGui::GetInputTextState(ImGui::GetID("###findInputTextWidget")))
input_state->ReloadUserBufAndMoveToEnd();
count = findReplaceHandler->GetMatches().size();
updateCount = true;
requestFocusFind = true;
@@ -805,12 +798,12 @@ namespace hex::plugin::builtin {
counterString = "hex.builtin.view.pattern_editor.no_results"_lang.operator std::string();
else {
if (position > 1999)
counterString = "?";
counterString = "? ";
else
counterString = hex::format("{} ", position);
counterString += "hex.builtin.view.pattern_editor.of"_lang.operator const char *();
if (count > 1999)
counterString += "1999+";
counterString += " 1999+";
else
counterString += hex::format(" {}", count);
}
@@ -842,11 +835,7 @@ namespace hex::plugin::builtin {
ImGui::TableNextColumn();
ImGui::TableNextColumn();
static int replaceFlags = ImGuiInputTextFlags_EnterReturnsTrue | ImGuiInputTextFlags_AutoSelectAll;
if (m_replaceHistoryIndex != m_replaceHistorySize && requestFocusReplace) {
replaceFlags |= ImGuiInputTextFlags_ReadOnly;
} else
replaceFlags &= ~ImGuiInputTextFlags_ReadOnly;
static int replaceFlags = ImGuiInputTextFlags_EnterReturnsTrue;
hint = "hex.builtin.view.pattern_editor.replace_hint"_lang.operator std::string();
if (m_replaceHistorySize > 0) {
@@ -869,12 +858,7 @@ namespace hex::plugin::builtin {
if (position == count)
position -= 1;
count -= 1;
if (count == 0)
requestFocusFind = true;
else
requestFocusReplace = true;
} else
requestFocusFind = true;
}
updateCount = true;
}
@@ -885,6 +869,7 @@ namespace hex::plugin::builtin {
enterPressedFind = false;
requestFocusFind = false;
}
requestFocusReplace = true;
}
if (requestFocus || requestFocusReplace) {
@@ -901,7 +886,8 @@ namespace hex::plugin::builtin {
replaceWord = m_replaceHistory[m_replaceHistoryIndex];
findReplaceHandler->SetReplaceWord(replaceWord);
if (ImGuiInputTextState* input_state = ImGui::GetInputTextState(ImGui::GetID("###replaceInputTextWidget")))
input_state->ReloadUserBufAndMoveToEnd();
requestFocusReplace = true;
}