Merge branch 'master' into jeremypw/sourceview/use-glib-menu

Author: jeremypw

data/code.metainfo.xml.in

@@ -29,10 +29,10 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/code/8.3.0/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/8.3.1/data/screenshot.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/code/8.3.0/data/screenshot-dark.png</image>
+      <image>https://raw.githubusercontent.com/elementary/code/8.3.1/data/screenshot-dark.png</image>
     </screenshot>
   </screenshots>
 
@@ -68,7 +68,7 @@
   <update_contact>contact_AT_elementary.io</update_contact>
 
   <releases>
-    <release version="8.3.1" date="2026-06-15" urgency="medium">
+    <release version="8.3.1" date="2026-06-19" urgency="medium">
       <description>
         <p>Improvements:</p>
         <ul>

meson.build

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

src/Dialogs/BranchActions/BranchListBox.vala

@@ -4,7 +4,7 @@
 *
 * Authored by: Jeremy Wootten <jeremywootten@gmail.com>
 */
-private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
+private class Scratch.Dialogs.BranchListBox : Gtk.Box {
 
     public signal void branch_changed (string branch_name);
 
@@ -31,6 +31,9 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
     }
 
     construct {
+        orientation = VERTICAL;
+        spacing = 6;
+
         list_box = new Gtk.ListBox () {
             activate_on_single_click = false
         };
@@ -47,12 +50,6 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
             placeholder_text = _("Enter search term")
         };
 
-        var box = new Gtk.Box (VERTICAL, 6);
-        box.add (search_entry);
-        box.add (scrolled_window);
-
-        child = box;
-
         recent_header = new Granite.HeaderLabel (_("Recent Branches"));
         local_header = new Granite.HeaderLabel (_("Local Branches"));
         remote_header = new Granite.HeaderLabel (_("Remote Branches"));
@@ -91,6 +88,9 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
         search_entry.activate.connect (() => {
             dialog.page_activated ();
         });
+
+        add (search_entry);
+        add (scrolled_window);
     }
 
     public BranchNameRow? get_selected_row () {