Port to GTK 4

.github/workflows/main.yml

@@ -31,7 +31,7 @@ jobs:
     - name: Install Dependencies
       run: |
         apt update
-        apt install -y desktop-file-utils libaccountsservice-dev libgdk-pixbuf2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev libhandy-1-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libx11-dev meson valac
+        apt install -y desktop-file-utils libaccountsservice-dev libgdk-pixbuf2.0-dev libgnome-desktop-3-dev libgranite-7-dev libgtk-4-dev libadwaita-1-dev liblightdm-gobject-1-dev ${{ matrix.mutter_pkg }} libx11-dev meson valac
     - name: Build
       env:
         DESTDIR: out

data/Application.css

@@ -4,6 +4,8 @@
  */
 
 .background {
+    background: transparent;
+    box-shadow: none;
     opacity: 0;
     transition: opacity 1s ease;
 }
@@ -12,6 +14,7 @@
     opacity: 1;
 }
 
+
 .date,
 .time {
     color: #fff;

po/POTFILES

@@ -30,7 +30,6 @@ src/Settings.vala
 src/Cards/BaseCard.vala
 src/Cards/ManualCard.vala
 src/Cards/UserCard.vala
-src/Widgets/BackgroundImage.vala
 src/Widgets/CapsLockRevealer.vala
 src/Widgets/DateTimeWidget.vala
 src/Widgets/PasswordEntry.vala

src/Application.vala

@@ -37,15 +37,12 @@ public class Greeter.Application : Gtk.Application {
     protected override void startup () {
         base.startup ();
 
-        var css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("/io/elementary/greeter/Application.css");
-
-        Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        Granite.init ();
     }
 
     public override void activate () {
         add_window (new Greeter.MainWindow ());
-        active_window.show_all ();
+        active_window.present ();
     }
 
     public static int main (string[] args) {

src/Cards/BaseCard.vala

@@ -22,8 +22,6 @@
 public abstract class Greeter.BaseCard : Gtk.Box {
     public signal void do_connect (string? credential = null);
 
-    protected static Gtk.CssProvider css_provider;
-
     public bool connecting { get; set; default = false; }
     public bool need_password { get; set; default = false; }
     public bool use_fingerprint { get; set; default = false; }
@@ -38,11 +36,6 @@ public abstract class Greeter.BaseCard : Gtk.Box {
 
     protected Gtk.Revealer revealer;
 
-    static construct {
-        css_provider = new Gtk.CssProvider ();
-        css_provider.load_from_resource ("/io/elementary/greeter/Card.css");
-    }
-
     construct {
         revealer = new Gtk.Revealer () {
             halign = CENTER,
@@ -52,8 +45,7 @@ public abstract class Greeter.BaseCard : Gtk.Box {
             width_request = 350
         };
 
-        add (revealer);
-        events |= Gdk.EventMask.BUTTON_RELEASE_MASK;
+        append (revealer);
 
         revealer.notify["child-revealed"].connect (() => {
             if (!revealer.child_revealed) {

src/Cards/ManualCard.vala

@@ -22,7 +22,7 @@ public class Greeter.ManualCard : Greeter.BaseCard {
             hexpand = true,
             margin_bottom = 16
         };
-        label.get_style_context ().add_class (Granite.STYLE_CLASS_H2_LABEL);
+        label.add_css_class (Granite.STYLE_CLASS_H2_LABEL);
 
         username_entry = new Gtk.Entry () {
             hexpand = true,
@@ -41,8 +41,8 @@ public class Greeter.ManualCard : Greeter.BaseCard {
         var caps_lock_revealer = new Greeter.CapsLockRevealer ();
 
         var password_box = new Gtk.Box (VERTICAL, 6);
-        password_box.add (password_entry);
-        password_box.add (caps_lock_revealer);
+        password_box.append (password_entry);
+        password_box.append (caps_lock_revealer);
 
         var session_button = new Greeter.SessionButton ();
 
@@ -66,11 +66,9 @@ public class Greeter.ManualCard : Greeter.BaseCard {
             margin_start = 12,
             margin_end = 12
         };
-        main_box.add (form_grid);
-
-        unowned var main_grid_style_context = main_box.get_style_context ();
-        main_grid_style_context.add_class (Granite.STYLE_CLASS_CARD);
-        main_grid_style_context.add_class (Granite.STYLE_CLASS_ROUNDED);
+        main_box.append (form_grid);
+        main_box.add_css_class (Granite.STYLE_CLASS_CARD);
+        main_box.add_css_class (Granite.STYLE_CLASS_ROUNDED);
 
         child = main_box;
 
@@ -79,13 +77,19 @@ public class Greeter.ManualCard : Greeter.BaseCard {
 
         username_entry.activate.connect (() => do_connect_username (username_entry.text));
         password_entry.activate.connect (on_login);
-        grab_focus.connect (() => {
-            if (username_entry.sensitive) {
-                username_entry.grab_focus_without_selecting ();
-            } else {
-                password_entry.grab_focus_without_selecting ();
+
+        var focus_controller = new Gtk.EventControllerFocus ();
+        focus_controller.enter.connect (() => {
+            if (focus_controller.is_focus) {
+                if (username_entry.sensitive) {
+                    username_entry.grab_focus_without_selecting ();
+                } else {
+                    password_entry.grab_focus_without_selecting ();
+                }
             }
         });
+
+        add_controller (focus_controller);
     }
 
     private void on_login () {
@@ -119,19 +123,14 @@ public class Greeter.ManualCard : Greeter.BaseCard {
     public override void wrong_credentials () {
         password_entry.text = "";
 
-        unowned var username_entry_style_context = username_entry.get_style_context ();
-        username_entry_style_context.add_class (Gtk.STYLE_CLASS_ERROR);
-
-        unowned var password_entry_style_context = password_entry.get_style_context ();
-        password_entry_style_context.add_class (Gtk.STYLE_CLASS_ERROR);
-
-        unowned var grid_style_context = main_box.get_style_context ();
-        grid_style_context.add_class ("shake");
+        username_entry.add_css_class (Granite.STYLE_CLASS_ERROR);
+        password_entry.add_css_class (Granite.STYLE_CLASS_ERROR);
+        main_box.add_css_class ("shake");
 
         Timeout.add (ERROR_SHAKE_DURATION, () => {
-            grid_style_context.remove_class ("shake");
-            username_entry_style_context.remove_class (Gtk.STYLE_CLASS_ERROR);
-            password_entry_style_context.remove_class (Gtk.STYLE_CLASS_ERROR);
+            main_box.remove_css_class ("shake");
+            username_entry.remove_css_class (Granite.STYLE_CLASS_ERROR);
+            password_entry.remove_css_class (Granite.STYLE_CLASS_ERROR);
 
             connecting = false;
             focus_username_entry ();
@@ -148,15 +147,12 @@ public class Greeter.ManualCard : Greeter.BaseCard {
         username_entry.secondary_icon_name = "";
         username_entry.text = "";
 
-        unowned var entry_style_context = username_entry.get_style_context ();
-        entry_style_context.add_class (Gtk.STYLE_CLASS_ERROR);
-
-        unowned var grid_style_context = main_box.get_style_context ();
-        grid_style_context.add_class ("shake");
+        username_entry.add_css_class (Granite.STYLE_CLASS_ERROR);
+        main_box.add_css_class ("shake");
 
         Timeout.add (ERROR_SHAKE_DURATION, () => {
-            grid_style_context.remove_class ("shake");
-            entry_style_context.remove_class (Gtk.STYLE_CLASS_ERROR);
+            main_box.remove_css_class ("shake");
+            username_entry.remove_css_class (Granite.STYLE_CLASS_ERROR);
 
             return Source.REMOVE;
         });