Port to Gtk4 (#227)

Co-authored-by: Leo <[email protected]>

Author: danirabbit

.github/workflows/main.yml

@@ -23,7 +23,7 @@ jobs:
       - name: Install Dependencies
         run: |
           apt update
-          apt install -y libhandy-1-dev libcanberra-dev libcanberra-gtk3-dev libgranite-dev libgtk-3-dev meson valac
+          apt install -y libadwaita-1-dev libcanberra-dev libgranite-7-dev libgtk-4-dev meson valac
       - name: Build
         env:
           DESTDIR: out

README.md

@@ -7,10 +7,9 @@ a Gtk notification server for Pantheon
 
 You'll need the following dependencies:
 * libcanberra
-* libcanberra-gtk3
-* libgranite-dev (>=5)
-* libgtk-3-dev
-* libhandy-1-dev (>=0.90.0)
+* libgranite-7-dev (>=7.0.0)
+* libgtk-4-dev
+* libadwaita-1-dev (>=1.0.0)
 * meson
 * valac
 

data/application.css

@@ -1,4 +1,3 @@
-decoration,
 window,
 .titlebar {
     background: transparent;
@@ -18,24 +17,31 @@ window,
             @BLACK_500
         );
     box-shadow:
-        inset 0 0 0 1px alpha (#fff, 0.02),
-        inset 0 1px 0 0 alpha (#fff, 0.07),
-        inset 0 -1px 0 0 alpha (#fff, 0.01),
-        0 0 0 1px alpha (#000, 0.7),
-        0 1px 2px alpha (#000, 0.16),
-        0 2px 3px alpha (#000, 0.23);
+        inset 0 0 0 1px alpha(#fff, 0.02),
+        inset 0 1px 0 0 alpha(#fff, 0.07),
+        inset 0 -1px 0 0 alpha(#fff, 0.01),
+        0 0 0 1px alpha(#000, 0.7),
+        0 1px 2px alpha(#000, 0.16),
+        0 2px 3px alpha(#000, 0.23);
     margin: 3px;
+    -gtk-icon-size: 24px;
 }
 
 .close image {
     color: #fff;
-    -gtk-icon-shadow: 0 1px 1px alpha (#000, 0.6);
+    -gtk-icon-shadow: 0 1px 1px alpha(#000, 0.6);
 }
 
+.notification stack > box,
 .notification stack > grid {
     padding: 6px;
 }
 
+.notification progressbar.flat progress {
+    background-image: none;
+    box-shadow: none;
+}
+
 .notification .draw-area {
     margin: 16px;
 }
@@ -64,6 +70,10 @@ window,
     animation: urgent 1.25s ease-in-out;
 }
 
+masked-image {
+    margin: 5px 4px 3px;
+}
+
 @keyframes urgent {
     0% { -gtk-icon-transform: scale(1) rotate(0deg); }
     10% { -gtk-icon-transform: scale(0.8) rotate(30deg); }

data/image-mask.svg

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
   <gresource prefix="/io/elementary/notifications">
-    <file alias="application.css" compressed="true">application.css</file>
-    <file alias="image-mask.svg" compressed="true">image-mask.svg</file>
+    <file alias="Application.css" compressed="true">application.css</file>
   </gresource>
 </gresources>

data/notifications.gresource.xml

@@ -21,6 +21,7 @@ executable(
     'src/AbstractBubble.vala',
     'src/Application.vala',
     'src/Bubble.vala',
+    'src/CanberraGtk4.vala',
     'src/Confirmation.vala',
     'src/DBus.vala',
     'src/FdoActionGroup.vala',
@@ -29,13 +30,13 @@ executable(
     css_gresource,
     dependencies: [
         dependency ('libcanberra'),
-        dependency ('libcanberra-gtk3'),
         dependency ('glib-2.0'),
         dependency ('gobject-2.0'),
         dependency ('gio-2.0'),
-        dependency ('granite', version: '>=5.4.0'),
-        dependency ('gtk+-3.0'),
-        dependency ('libhandy-1')
+        dependency ('granite-7', version: '>=7.0.0'),
+        dependency ('gtk4'),
+        dependency ('gtk4-x11'),
+        dependency ('libadwaita-1')
     ],
     install : true
 )