Merge branch 'master' into jeremypw/separate-terminal-zoom

# Conflicts:
#	src/MainWindow.vala
#	src/Widgets/Terminal.vala

Author: jeremypw

data/code.metainfo.xml.in

@@ -68,6 +68,21 @@
   <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
+      <release version="8.3.2" date="2026-08-04" urgency="medium">
+      <description>
+        <p>Minor updates:</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+      <issues>
+        <issue url="https://github.com/elementary/code/issues/851">Word completion retains deleted words</issue>
+        <issue url="https://github.com/elementary/code/issues/1527">Word completion omits first word in document until refreshed</issue>
+        <issue url="https://github.com/elementary/code/issues/1737">Changing pane visibility in one window affects all windows</issue>
+        <issue url="https://github.com/elementary/code/issues/1750">Code uses system document font instead of monospace font by default</issue>
+      </issues>
+    </release>
+
     <release version="8.3.1" date="2026-06-19" urgency="medium">
       <description>
         <p>Improvements:</p>

meson.build

@@ -2,7 +2,7 @@ project(
     'io.elementary.code',
     'vala', 'c',
     meson_version: '>= 0.58.0',
-    version: '8.3.1'
+    version: '8.3.2'
 )
 
 add_project_arguments([

plugins/brackets-completion/brackets-completion.vala

@@ -11,6 +11,7 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
 
     public Object object { owned get; set construct; }
 
+    private Gtk.EventControllerKey key_controller;
     private Gee.HashMap<string, string> brackets;
     private Gee.HashMap<uint, string> keys;
     private Gtk.TextBuffer current_buffer;
@@ -40,6 +41,12 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
 
         plugins = (Scratch.Services.Interface) object;
         plugins.hook_document.connect (on_hook_document);
+        plugins.hook_window.connect ((w) => {
+            key_controller = new Gtk.EventControllerKey (w) {
+                propagation_phase = CAPTURE
+            };
+            key_controller.key_pressed.connect (on_key_down);
+        });
     }
 
     public void deactivate () {
@@ -52,14 +59,12 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         current_buffer = doc.source_view.buffer;
 
         if (current_source_view != null) {
-            current_source_view.key_press_event.disconnect (on_key_down);
             current_source_view.event_after.disconnect (on_event_after);
             current_source_view.backspace.disconnect (on_backspace);
         }
 
         current_source_view = doc.source_view;
 
-        current_source_view.key_press_event.connect (on_key_down);
         current_source_view.event_after.connect (on_event_after);
         current_source_view.backspace.connect (on_backspace);
     }
@@ -163,8 +168,17 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
         current_buffer.end_user_action ();
     }
 
-    private bool on_key_down (Gdk.EventKey event) {
-        if (Gdk.ModifierType.MOD1_MASK in event.state || Gdk.ModifierType.CONTROL_MASK in event.state) {
+    private bool on_key_down (
+        uint keyval,
+        uint keycode,
+        Gdk.ModifierType state
+    ) requires (current_source_view != null && current_buffer != null) {
+
+        if (!current_source_view.is_focus) {
+            return false;
+        }
+
+        if (Gdk.ModifierType.MOD1_MASK in state || Gdk.ModifierType.CONTROL_MASK in state) {
             return false;
         }
 
@@ -173,7 +187,7 @@ public class Scratch.Plugins.BracketsCompletion : Peas.ExtensionBase, Scratch.Se
             return false;
         }
 
-        if (keys.has_key (event.keyval) && current_buffer.has_selection) {
+        if (keys.has_key (keyval) && current_buffer.has_selection) {
             Gtk.TextIter start, end;
             current_buffer.get_selection_bounds (out start, out end);
 

plugins/fuzzy-search/fuzzy-search-popover.vala

@@ -7,6 +7,13 @@
  */
 
 public class Scratch.FuzzySearchPopover : Gtk.Popover {
+    public signal void open_file (string filepath);
+    public signal void close_search ();
+
+    public Scratch.MainWindow current_window { get; construct; }
+    public Scratch.Services.FuzzySearchIndexer search_indexer { get; construct; }
+    public bool sidebar_is_visible { get; set; }
+
     private Gtk.SearchEntry search_term_entry;
     private Services.FuzzyFinder fuzzy_finder;
     private Gtk.ListBox search_result_container;
@@ -20,12 +27,6 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
     private Gtk.EventControllerKey search_term_entry_key_controller;
     private Gtk.Label title_label;
     private string current_doc_project;
-    public Scratch.MainWindow current_window { get; construct; }
-    public Scratch.Services.FuzzySearchIndexer search_indexer { get; construct; }
-    public bool sidebar_is_visible { get; set; }
-
-    public signal void open_file (string filepath);
-    public signal void close_search ();
 
     public FuzzySearchPopover (Scratch.Services.FuzzySearchIndexer search_indexer, Scratch.MainWindow window) {
         Object (
@@ -34,58 +35,54 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
         );
     }
 
-    private void calculate_scroll_offset (int old_position, int new_position) {
-        // Shortcut if jumping from first to last or the other way round
-        if (new_position == 0 && old_position > new_position) {
-            scrolled.vadjustment.value = 0;
-            return;
-        } else if (old_position == 0 && new_position == items.size - 1) {
-            scrolled.vadjustment.value = scrolled.vadjustment.get_upper ();
-            return;
-        }
-
-        var size_box = scrolled.vadjustment.get_upper () / items.size;
-        var current_top = scrolled.vadjustment.value;
-        var current_bottom = current_top + size_box * (max_items - 2);
-        if (old_position < new_position) {
-            // Down movement
-            var new_adjust = size_box * (preselected_index);
-            if (new_adjust >= current_bottom) {
-                scrolled.vadjustment.value = size_box * (preselected_index - (max_items - 1));
-            }
-        } else if (old_position > new_position) {
-            // Up movement
-            var new_adjust = size_box * (preselected_index);
-            if (new_adjust < current_top) {
-                scrolled.vadjustment.value = new_adjust;
-            }
-        }
-    }
-
     construct {
         modal = true;
         relative_to = current_window.document_view;
         width_request = 500;
         pointing_to = { 0, 32, 1, 1 };
+        get_style_context ().add_class ("fuzzy-popover");
 
-        this.get_style_context ().add_class ("fuzzy-popover");
+        title_label = new Granite.HeaderLabel (_("Find project files"));
 
-        title_label = new Gtk.Label (_("Find project files"));
-        title_label.halign = Gtk.Align.START;
-        title_label.get_style_context ().add_class ("h4");
-
-        search_term_entry = new Gtk.SearchEntry ();
-        search_term_entry.halign = Gtk.Align.FILL;
-        search_term_entry.hexpand = true;
+        search_term_entry = new Gtk.SearchEntry () {
+            hexpand = true,
+            valign = START
+        };
 
         search_result_container = new Gtk.ListBox () {
-            selection_mode = Gtk.SelectionMode.NONE,
+            selection_mode = NONE,
             activate_on_single_click = true,
             can_focus = false
         };
-
         search_result_container.get_style_context ().add_class ("fuzzy-list");
 
+        var entry_layout = new Gtk.Box (VERTICAL, 0) {
+            valign = START
+        };
+        entry_layout.add (title_label);
+        entry_layout.add (search_term_entry);
+
+        scrolled = new Gtk.ScrolledWindow (null, null) {
+            propagate_natural_height = true,
+            hexpand = true,
+            vexpand = true,
+            child = search_result_container
+        };
+
+        var box = new Gtk.Box (VERTICAL, 0);
+        box.add (entry_layout);
+        box.add (scrolled);
+        box.show_all ();
+
+        scrolled.hide ();
+
+        add (box);
+
+        fuzzy_finder = new Services.FuzzyFinder (search_indexer.project_paths);
+        indexer = search_indexer;
+        items = new Gee.ArrayList<FileItem> ();
+        cancellables = new Gee.LinkedList<GLib.Cancellable> ();
+
         search_result_container.row_activated.connect ((row) => {
             var file_item = row as FileItem;
             if (file_item == null) {
@@ -225,33 +222,6 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
             }
         });
 
-        var entry_layout = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        entry_layout.valign = Gtk.Align.START;
-
-        entry_layout.add (title_label);
-        entry_layout.add (search_term_entry);
-        search_term_entry.valign = Gtk.Align.START;
-
-        scrolled = new Gtk.ScrolledWindow (null, null) {
-            propagate_natural_height = true,
-            hexpand = true
-        };
-
-        scrolled.add (search_result_container);
-
-        var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        box.pack_start (entry_layout, false, false);
-        box.pack_end (scrolled, true, true);
-        box.show_all ();
-
-        scrolled.hide ();
-        this.add (box);
-
-        fuzzy_finder = new Services.FuzzyFinder (search_indexer.project_paths);
-        indexer = search_indexer;
-        items = new Gee.ArrayList<FileItem> ();
-        cancellables = new Gee.LinkedList<GLib.Cancellable> ();
-
         search_term_entry.realize.connect_after (() => {
             int height;
             current_window.get_size (null, out height);
@@ -286,6 +256,34 @@ public class Scratch.FuzzySearchPopover : Gtk.Popover {
         });
     }
 
+    private void calculate_scroll_offset (int old_position, int new_position) {
+        // Shortcut if jumping from first to last or the other way round
+        if (new_position == 0 && old_position > new_position) {
+            scrolled.vadjustment.value = 0;
+            return;
+        } else if (old_position == 0 && new_position == items.size - 1) {
+            scrolled.vadjustment.value = scrolled.vadjustment.get_upper ();
+            return;
+        }
+
+        var size_box = scrolled.vadjustment.get_upper () / items.size;
+        var current_top = scrolled.vadjustment.value;
+        var current_bottom = current_top + size_box * (max_items - 2);
+        if (old_position < new_position) {
+            // Down movement
+            var new_adjust = size_box * (preselected_index);
+            if (new_adjust >= current_bottom) {
+                scrolled.vadjustment.value = size_box * (preselected_index - (max_items - 1));
+            }
+        } else if (old_position > new_position) {
+            // Up movement
+            var new_adjust = size_box * (preselected_index);
+            if (new_adjust < current_top) {
+                scrolled.vadjustment.value = new_adjust;
+            }
+        }
+    }
+
     private void handle_item_selection (int index) {
         var item = items.get (index);
         open_file (item.filepath.strip ());

plugins/markdown-actions/markdown-actions.vala

@@ -27,11 +27,13 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services
 
     public void update_state () {}
 
+    private Gtk.EventControllerKey key_controller;
+    private bool is_markdown = false;
+
     public void activate () {
         plugins = (Scratch.Services.Interface) object;
         plugins.hook_document.connect ((doc) => {
             if (current_source != null) {
-                current_source.key_press_event.disconnect (shortcut_handler);
                 current_source.notify["language"].disconnect (configure_shortcuts);
             }
 
@@ -40,30 +42,44 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services
 
             current_source.notify["language"].connect (configure_shortcuts);
         });
+        plugins.hook_window.connect ((w) => {
+            key_controller = new Gtk.EventControllerKey (w) {
+                propagation_phase = CAPTURE
+            };
+            key_controller.key_pressed.connect (shortcut_handler);
+        });
     }
 
     private void configure_shortcuts () {
         var lang = current_source.language;
-        if (lang != null && lang.id == "markdown") {
-            current_source.key_press_event.connect (shortcut_handler);
-        } else {
-            current_source.key_press_event.disconnect (shortcut_handler);
-        }
+        is_markdown = (lang != null && lang.id == "markdown");
     }
 
-    private bool shortcut_handler (Gdk.EventKey evt) {
-        var control = (evt.state & Gdk.ModifierType.CONTROL_MASK) != 0;
-        var shift = (evt.state & Gdk.ModifierType.SHIFT_MASK) != 0;
-        var other_mods = (evt.state & Gtk.accelerator_get_default_mod_mask () &
-                          ~Gdk.ModifierType.SHIFT_MASK &
-                          ~Gdk.ModifierType.CONTROL_MASK) != 0;
+    private bool shortcut_handler (
+        Gtk.EventController controller,
+        uint keyval,
+        uint keycode,
+        Gdk.ModifierType state
+    ) requires (current_source != null) {
 
-        if (evt.is_modifier == 1 || other_mods == true) {
+        if (!current_source.is_focus) {
             return false;
         }
 
+        if (!is_markdown || !Gtk.accelerator_valid (keyval, state)) {
+            return false;
+        }
+
+        var mods = (state & Gtk.accelerator_get_default_mod_mask ());
+        if (((mods & ~Gdk.ModifierType.SHIFT_MASK) & ~Gdk.ModifierType.CONTROL_MASK) != 0) {
+            // A modifier other than Control or Shift is down
+            return false;
+        }
+
+        var control = (mods & Gdk.ModifierType.CONTROL_MASK) != 0;
+        var shift = (mods & Gdk.ModifierType.SHIFT_MASK) != 0;
         if (control && shift) {
-            switch (evt.keyval) {
+            switch (keyval) {
                 case Gdk.Key.B:
                     add_markdown_tag ("**");
                     return true;
@@ -76,7 +92,7 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services
             }
         }
 
-        if (evt.keyval == Gdk.Key.Return) {
+        if (keyval == Gdk.Key.Return) {
             char ul_marker;
             int ol_number = 1;
             string item_text;
@@ -100,6 +116,7 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services
                 return true;
             }
         }
+
         return false;
     }
 
@@ -234,7 +251,6 @@ public class Code.Plugins.MarkdownActions : Peas.ExtensionBase, Scratch.Services
 
     public void deactivate () {
         if (current_source != null) {
-            current_source.key_press_event.disconnect (shortcut_handler);
             current_source.notify["language"].disconnect (configure_shortcuts);
         }
     }