From 42dcac19959c38396f6163c904710d2d0080e621 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Thu, 3 Sep 2026 12:57:29 +0100 Subject: [PATCH 1/2] Update search_settings for case sensitive search earlier --- src/Widgets/SearchBar.vala | 39 +++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/src/Widgets/SearchBar.vala b/src/Widgets/SearchBar.vala index a58ed50ac..bf5c4e649 100644 --- a/src/Widgets/SearchBar.vala +++ b/src/Widgets/SearchBar.vala @@ -430,6 +430,28 @@ public class Scratch.Widgets.SearchBar : Gtk.Box { //TODO In Gtk4 use a BinLayou private void on_settings_changed (string key) { switch (key) { case "case-sensitive-search": + switch (settings.get_enum ("case-sensitive-search")) { + case CaseSensitiveMode.NEVER: + warning ("NEVER"); + search_settings.case_sensitive = false; + break; + case CaseSensitiveMode.MIXED: + warning ("MIXED"); + search_settings.case_sensitive = !( + search_entry.text.up () == search_entry.text || + search_entry.text.down () == search_entry.text + ); + break; + case CaseSensitiveMode.ALWAYS: + warning ("ALWAYS"); + search_settings.case_sensitive = true; + break; + default: + assert_not_reached (); + } + + update_search_widgets (); + break; case "cyclic-search": case "regex-search": case "wholeword-search": @@ -585,23 +607,6 @@ public class Scratch.Widgets.SearchBar : Gtk.Box { //TODO In Gtk4 use a BinLayou } } - switch (settings.get_enum ("case-sensitive-search")) { - case CaseSensitiveMode.NEVER: - search_settings.case_sensitive = false; - break; - case CaseSensitiveMode.MIXED: - search_settings.case_sensitive = !( - search_entry.text.up () == search_entry.text || - search_entry.text.down () == search_entry.text - ); - break; - case CaseSensitiveMode.ALWAYS: - search_settings.case_sensitive = true; - break; - default: - assert_not_reached (); - } - // Update appearance of search entry var ctx = search_entry.get_style_context (); From edfb2273c136992a2be6cd01d1626c698d68c03e Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Thu, 3 Sep 2026 13:02:08 +0100 Subject: [PATCH 2/2] Remove debug code --- src/Widgets/SearchBar.vala | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/Widgets/SearchBar.vala b/src/Widgets/SearchBar.vala index bf5c4e649..583bb9e6b 100644 --- a/src/Widgets/SearchBar.vala +++ b/src/Widgets/SearchBar.vala @@ -432,18 +432,15 @@ public class Scratch.Widgets.SearchBar : Gtk.Box { //TODO In Gtk4 use a BinLayou case "case-sensitive-search": switch (settings.get_enum ("case-sensitive-search")) { case CaseSensitiveMode.NEVER: - warning ("NEVER"); search_settings.case_sensitive = false; break; case CaseSensitiveMode.MIXED: - warning ("MIXED"); search_settings.case_sensitive = !( search_entry.text.up () == search_entry.text || search_entry.text.down () == search_entry.text ); break; case CaseSensitiveMode.ALWAYS: - warning ("ALWAYS"); search_settings.case_sensitive = true; break; default: