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

fix: pattern editor find/replace. (#2686)

Browse Source 
A recent commit broke the pattern editor popups for fin/replace and goto
line. The problem was cause by changes to the function that returns the
name of the currently focused subwindow using a function that only
updates when ImHex main window losses focus. The commit was aimed at
fixing evaluation of shortcuts in pattern data view and pattern editor
simultaneously but missed to fix some shortcuts like cut and paste.

The fix substitutes how the subwindow is first selected by using the
result of the subwindow selection used by imhex to insure that menus and
other ui components don't steal focus from views. The function that
returns the name of the current focused subwindow was changed to use
this value. This fixes both the window popups of pattern editor and all
the shortcut duplications.
This commit is contained in:
paxcut
2026-03-14 16:59:32 -07:00
committed by GitHub
parent 8d691b2e6a
commit 432e16e0c4
2 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/libimhex/include/hex/ui/view.hpp
View File

@@ -146,7 +146,8 @@ namespace hex {
*/
class View::Window : public View {
public:
explicit Window(UnlocalizedString unlocalizedName, const char *icon) : View(std::move(unlocalizedName), icon), m_focusedSubWindow(nullptr) {}
explicit Window(UnlocalizedString unlocalizedName, const char *icon) : View(std::move(unlocalizedName), icon) {}
[[nodiscard]] ImGuiWindow *getFocusedSubWindow() const { return m_focusedSubWindow; }
/**
* @brief Draws help text for the view
@@ -155,7 +156,7 @@ namespace hex {
void draw(ImGuiWindowFlags extraFlags = ImGuiWindowFlags_None) override;
virtual bool allowScroll() const {
[[nodiscard]] virtual bool allowScroll() const {
return false;
}
@@ -163,7 +164,7 @@ namespace hex {
void handleFocusRestoration();
private:
ImGuiWindow *m_focusedSubWindow;
ImGuiWindow *m_focusedSubWindow{nullptr};
};
/**
@@ -198,7 +199,7 @@ namespace hex {
void draw(ImGuiWindowFlags extraFlags = ImGuiWindowFlags_None) final;
bool allowScroll() const final {
[[nodiscard]] bool allowScroll() const final {
return true;
}
};

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

@@ -67,10 +67,6 @@ namespace hex::plugin::builtin {
constexpr static auto TextEditorView = "/##pattern_editor_";
constexpr static auto ConsoleView = "/##console_";
constexpr static auto VariablesView = "/##env_vars_";
constexpr static auto SettingsView = "/##settings_";
constexpr static auto VirtualFilesView = "/##virtual_file_tree_";
constexpr static auto DebuggerView = "/##debugger_";
class ViewPatternEditor::PopupAcceptPattern : public Popup<PopupAcceptPattern> {
public:
@@ -451,11 +447,9 @@ namespace hex::plugin::builtin {
if (g.CurrentWindow->Appearing)
return;
if (g.NavWindow != nullptr) {
std::string name = g.NavWindow->Name;
if (name.contains(TextEditorView) || name.contains(ConsoleView) || name.contains(VariablesView) || name.contains(SettingsView) || name.contains(VirtualFilesView) || name.contains(DebuggerView))
m_focusedSubWindowName = name;
}
auto *focusedSubWindow = getFocusedSubWindow();
if (focusedSubWindow != nullptr)
m_focusedSubWindowName = focusedSubWindow->Name;
auto defaultEditorSize = ImGui::GetContentRegionAvail();
defaultEditorSize.y *= 0.66F;
@@ -690,10 +684,7 @@ namespace hex::plugin::builtin {
findReplaceHandler->setFindWord(textEditor, findWord);
requestFocus = true;
updateCount = true;
if (m_focusedSubWindowName.contains(ConsoleView))
canReplace = false;
else if (m_focusedSubWindowName.contains(TextEditorView))
canReplace = true;
canReplace = m_focusedSubWindowName.contains(TextEditorView);
}
bool enter = ImGui::IsKeyPressed(ImGuiKey_Enter, false) || ImGui::IsKeyPressed(ImGuiKey_KeypadEnter, false);
bool upArrow = ImGui::IsKeyPressed(ImGuiKey_UpArrow, false) || ImGui::IsKeyPressed(ImGuiKey_Keypad8, false);
@@ -1944,17 +1935,15 @@ namespace hex::plugin::builtin {
}
ui::TextEditor *ViewPatternEditor::getEditorFromFocusedWindow() {
if (!this->isFocused())
return nullptr;
auto provider = ImHexApi::Provider::get();
if (provider != nullptr) {
if (auto provider = ImHexApi::Provider::get(); provider != nullptr) {
if (m_focusedSubWindowName.contains(ConsoleView)) {
return &m_consoleEditor.get(provider);
}
if (m_focusedSubWindowName.contains(TextEditorView)) {
return &m_textEditor.get(provider);
}
return nullptr;
}
return nullptr;