Port to Gtk4 (#200)

.github/workflows/ci.yml

@@ -34,6 +34,11 @@ jobs:
         with:
           platforms: arm64
 
+      - name: Install Rust SDK extension
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
+
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:

.github/workflows/merge.yml

@@ -31,6 +31,11 @@ jobs:
         with:
           platforms: arm64
 
+      - name: Install Rust SDK extension
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
+
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:

.github/workflows/release.yml

@@ -53,6 +53,11 @@ jobs:
         with:
           platforms: arm64
 
+      - name: Install Rust SDK extension
+        run: |
+          flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+          flatpak install -y --arch=${{matrix.arch}} org.freedesktop.Sdk.Extension.rust-stable//23.08
+
       - name: Build
         uses: flatpak/flatpak-github-actions/flatpak-builder@v6
         with:

data/Application.css

@@ -16,3 +16,7 @@
 	border-right-width: 0;
 	padding-right: 0;
 }
+
+picture {
+    background: black;
+}

data/io.elementary.camera.gschema.xml

@@ -20,15 +20,20 @@
             <summary>The mode of the camera, photo or video</summary>
             <description>Photo mode is represented by 0, video mode by 1</description>
         </key>
-        <key name="window-maximized" type="b">
-          <default>false</default>
-          <summary>Whether the window was maximized on last run</summary>
-          <description>Whether the window was maximized on last run</description>
+        <key name="window-height" type="i">
+            <default>768</default>
+            <summary>Most recent window height</summary>
+            <description>Most recent window height</description>
+        </key>
+        <key name="window-width" type="i">
+            <default>918</default>
+            <summary>Most recent window width</summary>
+            <description>Most recent window width</description>
         </key>
-        <key name="window-size" type="(ii)">
-            <default>(918, 768)</default>
-            <summary>Most recent window size (height, width)</summary>
-            <description>Most recent window size (height, width)</description>
+        <key name="window-maximized" type="b">
+            <default>false</default>
+            <summary>Open window maximized</summary>
+            <description>Whether the main window of the application should open maximized or not.</description>
         </key>
     </schema>
 </schemalist>

io.elementary.camera.yml

@@ -3,6 +3,12 @@ runtime: io.elementary.Platform
 runtime-version: '8'
 sdk: io.elementary.Sdk
 command: io.elementary.camera
+sdk-extensions:
+  - "org.freedesktop.Sdk.Extension.rust-stable"
+build-options:
+  env:
+    CARGO_HOME: /run/build/cargo-c/cargo
+  append-path: /usr/lib/sdk/rust-stable/bin
 finish-args:
   - '--filesystem=xdg-pictures'
   - '--filesystem=xdg-videos'
@@ -11,13 +17,37 @@ finish-args:
   - '--socket=fallback-x11'
   - '--socket=wayland'
   - '--socket=pulseaudio'
+  - '--device=dri'
   - '--device=all'
+  - '--env=GST_PLUGIN_PATH_1_0=/app/lib64/gstreamer-1.0'
 
   - '--metadata=X-DConf=migrate-path=/io/elementary/camera/'
 cleanup:
   - '*.a'
   - '*.la'
 modules:
+  - name: cargo-c
+    buildsystem: simple
+    build-commands:
+      - "cargo install cargo-c --root /app"
+    build-options:
+      build-args:
+        - "--share=network"
+    cleanup:
+      - "*"
+
+  - name: gst-plugins-rs
+    buildsystem: simple
+    sources:
+    - type: git
+      url: https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs
+      branch: '0.12'
+    build-options:
+      build-args:
+        - "--share=network"
+    build-commands:
+      - "cargo cinstall -p gst-plugin-gtk4 --prefix=/app"
+
   - name: canberra
     config-opts:
       - '--enable-gstreamer'

meson.build

@@ -39,10 +39,9 @@ executable(
         dependency('gee-0.8'),
         dependency('gio-2.0'),
         dependency('glib-2.0'),
-        dependency('granite', version: '>=6.0.0'),
-        dependency('gtk+-3.0'),
+        dependency('granite-7', version: '>=7.2.0'),
+        dependency('gtk4'),
         dependency('libcanberra'),
-        dependency('libhandy-1', version: '>=0.90.0'),
         meson.get_compiler('vala').find_library('posix')
     ],
     install : true

src/Application.vala

@@ -28,48 +28,43 @@ public class Camera.Application : Gtk.Application {
 
     public override void startup () {
         base.startup ();
-        Hdy.init ();
+        Granite.init ();
 
         var quit_action = new SimpleAction ("quit", null);
         quit_action.activate.connect (quit);
         add_action (quit_action);
 
         set_accels_for_action ("app.quit", {"<Control>q"});
 
-        var application_provider = new Gtk.CssProvider ();
-        application_provider.load_from_resource (resource_base_path + "/Application.css");
-        Gtk.StyleContext.add_provider_for_screen (
-            Gdk.Screen.get_default (),
-            application_provider,
-            Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
-        );
-
         var granite_settings = Granite.Settings.get_default ();
         var gtk_settings = Gtk.Settings.get_default ();
 
         gtk_settings.gtk_application_prefer_dark_theme =
-            granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
+            granite_settings.prefers_color_scheme == DARK;
 
         granite_settings.notify["prefers-color-scheme"].connect (() => {
             gtk_settings.gtk_application_prefer_dark_theme =
-                granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
+                granite_settings.prefers_color_scheme == DARK;
         });
     }
 
     protected override void activate () {
         if (active_window == null) {
             var main_window = new MainWindow (this);
 
-            int width, height;
-            settings.get ("window-size", "(ii)", out width, out height);
-
-            main_window.resize (width, height);
+            /*
+            * This is very finicky. Bind size after present else set_titlebar gives us bad sizes
+            * Set maximize after height/width else window is min size on unmaximize
+            * Bind maximize as SET else get get bad sizes
+            */
+            settings.bind ("window-height", main_window, "default-height", DEFAULT);
+            settings.bind ("window-width", main_window, "default-width", DEFAULT);
 
             if (settings.get_boolean ("window-maximized")) {
                 main_window.maximize ();
             }
 
-            settings.bind ("window-maximized", main_window, "is-maximized", SET);
+            settings.bind ("window-maximized", main_window, "maximized", SET);
         }
 
         active_window.present ();