Merge branch 'main' into feat/gtk4

2 files changed, 12 insertions, 6 deletions

diff --git a/lang/lua/astal/binding.lua b/lang/lua/astal/binding.lua
index ba1e6e4..2944ec4 100644
--- a/lang/lua/astal/binding.lua
+++ b/lang/lua/astal/binding.lua
@@ -4,7 +4,7 @@ local GObject = lgi.require("GObject", "2.0")
 ---@class Binding
 ---@field emitter table|Variable
 ---@field property? string
----@field transformFn function
+---@field transform_fn function
 local Binding = {}
 
 ---@param emitter table
@@ -14,7 +14,7 @@ function Binding.new(emitter, property)
     return setmetatable({
         emitter = emitter,
         property = property,
-        transformFn = function(v)
+        transform_fn = function(v)
             return v
         end,
     }, Binding)
@@ -30,10 +30,10 @@ end
 
 function Binding:get()
     if self.property ~= nil and GObject.Object:is_type_of(self.emitter) then
-        return self.transformFn(self.emitter[self.property])
+        return self.transform_fn(self.emitter[self.property])
     end
     if type(self.emitter.get) == "function" then
-        return self.transformFn(self.emitter:get())
+        return self.transform_fn(self.emitter:get())
     end
     error("can not get: Not a GObject or a Variable " + self)
 end
@@ -42,8 +42,8 @@ end
 ---@return Binding
 function Binding:as(transform)
     local b = Binding.new(self.emitter, self.property)
-    b.transformFn = function(v)
-        return transform(self.transformFn(v))
+    b.transform_fn = function(v)
+        return transform(self.transform_fn(v))
     end
     return b
 end
diff --git a/lang/lua/astal/gtk3/init.lua b/lang/lua/astal/gtk3/init.lua
index 6fb5455..e5cc0e6 100644
--- a/lang/lua/astal/gtk3/init.lua
+++ b/lang/lua/astal/gtk3/init.lua
@@ -1,5 +1,11 @@
+local lgi = require("lgi")
+
 return {
     App = require("astal.gtk3.app"),
     astalify = require("astal.gtk3.astalify"),
     Widget = require("astal.gtk3.widget"),
+
+    Gtk = lgi.require("Gtk", "3.0"),
+    Gdk = lgi.require("Gdk", "3.0"),
+    Astal = lgi.require("Astal", "3.0"),
 }