Merge branch 'main' into feat/jsx-gtk4

4 files changed, 70 insertions, 3 deletions

diff --git a/lib/astal/gtk3/default.nix b/lib/astal/gtk3/default.nix
new file mode 100644
index 0000000..c86f3de
--- /dev/null
+++ b/lib/astal/gtk3/default.nix
@@ -0,0 +1,21 @@
+{
+  mkAstalPkg,
+  pkgs,
+  self,
+}:
+mkAstalPkg {
+  pname = "astal3";
+  src = ./.;
+  packages = [
+    self.packages.${pkgs.system}.io
+    pkgs.gtk3
+    pkgs.gtk-layer-shell
+  ];
+
+  libname = "astal3";
+  gir-suffix = "";
+  authors = "Aylur";
+  description = "Astal GTK3 widget library";
+  dependencies = ["AstalIO-0.1" "Gtk-3.0"];
+  repo-path = "astal/gtk3";
+}
diff --git a/lib/astal/gtk3/src/widget/icon.vala b/lib/astal/gtk3/src/widget/icon.vala
index 9a20359..ee6808c 100644
--- a/lib/astal/gtk3/src/widget/icon.vala
+++ b/lib/astal/gtk3/src/widget/icon.vala
@@ -9,7 +9,21 @@ public class Astal.Icon : Gtk.Image {
     private double size { get; set; default = 14; }
 
     public new Gdk.Pixbuf pixbuf { get; set; }
-    public GLib.Icon g_icon { get; set; }
+    
+    private static bool gicon_warned = false;
+    [Version (deprecated = true, deprecated_since = "0.1.0", replacement = "gicon")]
+    public GLib.Icon g_icon { 
+        owned get {
+            return this.gicon;
+        } 
+        set {
+            if( !gicon_warned ) {
+              GLib.warning("g-icon is deprecated. Use gicon instead.");
+              gicon_warned = true;
+            }
+            this.gicon = value;
+        }
+    }
 
     /**
      * Either a named icon or a path to a file.
@@ -57,7 +71,6 @@ public class Astal.Icon : Gtk.Image {
             break;
         case IconType.GICON:
             pixel_size = (int)size;
-            gicon = g_icon;
             break;
 
         }
@@ -86,7 +99,7 @@ public class Astal.Icon : Gtk.Image {
             display_icon.begin();
         });
 
-        notify["g-icon"].connect(() => {
+        notify["gicon"].connect(() => {
             type = IconType.GICON;
             display_icon.begin();
         });
diff --git a/lib/astal/gtk4/default.nix b/lib/astal/gtk4/default.nix
new file mode 100644
index 0000000..0bca3c0
--- /dev/null
+++ b/lib/astal/gtk4/default.nix
@@ -0,0 +1,21 @@
+{
+  mkAstalPkg,
+  pkgs,
+  self,
+}:
+mkAstalPkg {
+  pname = "astal4";
+  src = ./.;
+  packages = [
+    self.packages.${pkgs.system}.io
+    pkgs.gtk4
+    pkgs.gtk4-layer-shell
+  ];
+
+  libname = "astal4";
+  gir-suffix = "";
+  authors = "Aylur";
+  description = "Astal GTK4 widget library";
+  dependencies = ["AstalIO-0.1" "Gtk-4.0"];
+  repo-path = "astal/gtk4";
+}
diff --git a/lib/astal/io/default.nix b/lib/astal/io/default.nix
new file mode 100644
index 0000000..c33132a
--- /dev/null
+++ b/lib/astal/io/default.nix
@@ -0,0 +1,12 @@
+{mkAstalPkg, ...}:
+mkAstalPkg {
+  pname = "astal";
+  src = ./.;
+
+  libname = "io";
+  gir-suffix = "IO";
+  authors = "Aylur";
+  description = "Astal Core library";
+  repo-path = "astal/io";
+  website-path = "io";
+}