From c2d0236bedd376a08defbb7c254ec2ce834167e1 Mon Sep 17 00:00:00 2001 From: vanadiae Date: Fri, 6 Aug 2021 19:33:00 +0200 Subject: [PATCH 1/2] editor: Fix Ctrl+(Shift+)g not wrapping around search with entry focused Backward and forward search direction don't wrap around as said by the documentation. Only next and previous wrap around. Fixes #1396 --- src/libide/editor/ide-editor-search-bar.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libide/editor/ide-editor-search-bar.c b/src/libide/editor/ide-editor-search-bar.c index 614208503..b27499bc3 100644 --- a/src/libide/editor/ide-editor-search-bar.c +++ b/src/libide/editor/ide-editor-search-bar.c @@ -233,7 +233,7 @@ search_entry_previous_match (IdeEditorSearchBar *self, { ide_editor_search_set_extend_selection (self->search, IDE_EDITOR_SEARCH_SELECT_NONE); ide_editor_search_set_repeat (self->search, 0); - ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_BACKWARD); + ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_PREVIOUS); } } @@ -248,7 +248,7 @@ search_entry_next_match (IdeEditorSearchBar *self, { ide_editor_search_set_extend_selection (self->search, IDE_EDITOR_SEARCH_SELECT_NONE); ide_editor_search_set_repeat (self->search, 0); - ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_FORWARD); + ide_editor_search_move (self->search, IDE_EDITOR_SEARCH_NEXT); } } -- GitLab From a2738e6aa9f560f0f1f3f779b185941307b68713 Mon Sep 17 00:00:00 2001 From: vanadiae Date: Fri, 6 Aug 2021 19:35:09 +0200 Subject: [PATCH 2/2] grep: Make replace button and entry insensitive during search --- src/plugins/grep/gbp-grep-panel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/grep/gbp-grep-panel.c b/src/plugins/grep/gbp-grep-panel.c index e2839f0a8..16b781f60 100644 --- a/src/plugins/grep/gbp-grep-panel.c +++ b/src/plugins/grep/gbp-grep-panel.c @@ -482,6 +482,8 @@ gbp_grep_panel_launch_search (GbpGrepPanel *self) gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->spinner)); gtk_spinner_start (self->spinner); gtk_widget_set_sensitive (GTK_WIDGET (self->find_button), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (self->replace_button), FALSE); + gtk_widget_set_sensitive (GTK_WIDGET (self->replace_entry), FALSE); ide_widget_reveal_and_grab (GTK_WIDGET (self)); -- GitLab