Add property hook for Box.orient field

can-lehmann · Nov 30, 2023 · f9b3835 · f9b3835
1 parent e2bf7df
commit f9b3835
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/owlkettle/bindings/gtk.nim b/owlkettle/bindings/gtk.nim
@@ -627,6 +627,8 @@ proc gtk_widget_set_margin_start*(widget: GtkWidget, margin: cint)
 proc gtk_widget_set_margin_end*(widget: GtkWidget, margin: cint)
 proc gtk_widget_set_hexpand*(widget: GtkWidget, expand: cbool)
 proc gtk_widget_set_vexpand*(widget: GtkWidget, expand: cbool)
+proc gtk_widget_set_hexpand_set*(widget: GtkWidget, isSet: cbool)
+proc gtk_widget_set_vexpand_set*(widget: GtkWidget, isSet: cbool)
 proc gtk_widget_set_halign*(widget: GtkWidget, align: GtkAlign)
 proc gtk_widget_set_valign*(widget: GtkWidget, align: GtkAlign)
 proc gtk_widget_add_controller*(widget: GtkWidget, cont: GtkEventController)

diff --git a/owlkettle/common.nim b/owlkettle/common.nim
@@ -117,8 +117,8 @@ template customPragmas*() =
 template crossVersionDestructor*(name: untyped, typ: typedesc, body: untyped) =
   ## Defines a =destroy to work for both nim 2 and nim 1.6.X
   when NimMajor >= 2:
-    proc `=destroy`(name: typ) =
+    proc `=destroy`*(name: typ) =
       body
   else:
-    proc `=destroy`(name: var typ) =
+    proc `=destroy`*(name: var typ) =
       body
diff --git a/owlkettle/widgets.nim b/owlkettle/widgets.nim
@@ -212,6 +212,19 @@ renderable Box of BaseWidget:
         widget.valSpacing.cint
       )
 
+  hooks orient:
+    property:
+      gtk_orientable_set_orientation(state.internalWidget, state.orient.toGtk())
+      for child in state.children:
+        let childWidget = child.widget.unwrapInternalWidget()
+        case state.orient:
+          of OrientX:
+            gtk_widget_set_vexpand_set(childWidget, cbool(ord(false)))
+            gtk_widget_set_hexpand(childWidget, child.expand.ord.cbool)
+          of OrientY:
+            gtk_widget_set_hexpand_set(childWidget, cbool(ord(false)))
+            gtk_widget_set_vexpand(childWidget, child.expand.ord.cbool)
+
   hooks spacing:
     property:
       gtk_box_set_spacing(state.internalWidget, state.spacing.cint)
@@ -2263,6 +2276,11 @@ crossVersionDestructor(buffer, TextBufferObj):
 
   g_object_unref(pointer(buffer.gtk))
 
+proc `=sink`*(dest: var TextBufferObj; source: TextBufferObj) =
+  `=destroy`(dest)
+  wasMoved(dest)
+  dest.gtk = source.gtk
+
 proc `=copy`*(dest: var TextBufferObj, source: TextBufferObj) =
   let areSameObject = pointer(source.gtk) == pointer(dest.gtk)
   if areSameObject:
@@ -2272,12 +2290,12 @@ proc `=copy`*(dest: var TextBufferObj, source: TextBufferObj) =
   wasMoved(dest)
   if not isNil(source.gtk):
     g_object_ref(pointer(source.gtk))
-    
+
   dest.gtk = source.gtk
 
 proc newTextBuffer*(): TextBuffer =
   result = TextBuffer(gtk: gtk_text_buffer_new(nil.GtkTextTagTable))
-  
+
 {.push hint[Name]: off.}
 proc g_value_new(value: UnderlineKind): GValue =
   discard g_value_init(result.addr, G_TYPE_INT)
@@ -3805,7 +3823,7 @@ proc `=sink`(dest: var MediaStreamObj; source: MediaStreamObj) =
   `=destroy`(dest)
   wasMoved(dest)
   dest.gtk = source.gtk
-  
+
 proc `=copy`*(dest: var MediaStreamObj, source: MediaStreamObj) =
   let areSameObject = pointer(source.gtk) == pointer(dest.gtk)
   if areSameObject: