From 1a2263f6dbd74ab3d8e04ab24f5fa5961eaa99da Mon Sep 17 00:00:00 2001 From: eidheim Date: Wed, 18 Aug 2021 18:35:02 +0200 Subject: [PATCH] Preference item search_for_selection now also applies to Find Pattern --- src/window.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/window.cpp b/src/window.cpp index 903a998..cd50852 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -877,6 +877,12 @@ void Window::set_menu_actions() { menu.add_action("source_find_pattern", [this]() { EntryBox::get().clear(); + if(focused_view && Config::get().source.search_for_selection) { + Gtk::TextIter start, end; + if(focused_view->get_buffer()->get_selection_bounds(start, end)) + last_find_pattern = focused_view->get_buffer()->get_text(start, end); + } + EntryBox::get().entries.emplace_back(last_find_pattern, [this](const std::string &pattern_) { auto pattern = pattern_; // Store pattern to safely hide entrybox EntryBox::get().hide(); @@ -2090,12 +2096,10 @@ void Window::search_and_replace_entry() { } }; - if(focused_view) { - if(Config::get().source.search_for_selection) { - Gtk::TextIter start, end; - if(focused_view->get_buffer()->get_selection_bounds(start, end)) - last_search = focused_view->get_buffer()->get_text(start, end); - } + if(focused_view && Config::get().source.search_for_selection) { + Gtk::TextIter start, end; + if(focused_view->get_buffer()->get_selection_bounds(start, end)) + last_search = focused_view->get_buffer()->get_text(start, end); } EntryBox::get().entries.emplace_back(last_search, [this](const std::string &content) { if(focused_view)