Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-08 23:09:36 +01:00
Code 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
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/third_party/imgui/ColorTextEditor/source/TextEditor.cpp vendored
View File

@ -2518,7 +2518,6 @@ bool TextEditor::FindReplaceHandler::Replace(TextEditor *editor, bool next) {
u.mAfter = editor->mState; u.mAfter = editor->mState;
editor->AddUndo(u); editor->AddUndo(u);
editor->mTextChanged = true; editor->mTextChanged = true;
mMatches.erase(mMatches.begin() + matchIndex - 1);
return true; return true;
} }

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

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