From 19622ae72b27d70a79e31e8454c8edcdb0d6c05b Mon Sep 17 00:00:00 2001
From: Camil Staps
Date: Sun, 20 Oct 2019 12:43:09 +0200
Subject: Add GtkBox support

---
 src/Gtk/Widgets.icl | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

(limited to 'src/Gtk/Widgets.icl')

diff --git a/src/Gtk/Widgets.icl b/src/Gtk/Widgets.icl
index 0438525..b7deab5 100644
--- a/src/Gtk/Widgets.icl
+++ b/src/Gtk/Widgets.icl
@@ -17,6 +17,9 @@ import Gtk.Types
 instance gtkWidget GtkWidget where gtkWidget w = w
 instance ptr GtkWidget where ptr w = w
 
+show :: !w -> State GtkState w | gtkWidget w
+show widget = toState ('I'.gtk_widget_show (gtkWidget widget)) >>| pure widget
+
 :: GtkContainer :== Pointer
 
 instance gtkWidget GtkContainer where gtkWidget c = c
@@ -26,6 +29,21 @@ addToContainer :: !w !c -> State GtkState () | gtkWidget w & gtkContainer c
 addToContainer widget container =
 	toState ('I'.gtk_container_add (gtkContainer container) (gtkWidget widget))
 
+:: GtkBox :== Pointer
+
+instance gtkWidget GtkBox where gtkWidget b = b
+instance gtkContainer GtkBox where gtkContainer b = b
+
+newBox :: !GtkOrientation !Int -> State GtkState GtkBox
+newBox orientation spacing =
+	toStateR ('I'.gtk_box_new orientation=:Vertical spacing) >>=
+	show
+
+packBox :: !w !GtkBox !GtkDirection !GtkExpand -> State GtkState () | gtkWidget w
+packBox widget box direction expand =
+	toState (if direction=:StartToEnd 'I'.gtk_box_pack_start 'I'.gtk_box_pack_end
+		box (gtkWidget widget) expand=:Expand True 0)
+
 :: GtkPaned :== Pointer
 
 instance gtkWidget GtkPaned where gtkWidget p = p
@@ -35,8 +53,7 @@ newPaned :: !GtkOrientation !GtkPanedHandleWidth -> State GtkState GtkPaned
 newPaned orientation handle_width =
 	toStateR ('I'.gtk_paned_new orientation=:Vertical) >>= \paned ->
 	toState ('I'.gtk_paned_set_wide_handle paned handle_width=:WideHandle) >>|
-	toState ('I'.gtk_widget_show paned) >>|
-	pure paned
+	show paned
 
 packPane1 :: !w !GtkPaned !GtkResize !GtkShrink -> State GtkState () | gtkWidget w
 packPane1 widget paned resize shrink =
@@ -57,10 +74,7 @@ instance gtkWidget GtkTextView where gtkWidget tv = tv
 instance gtkContainer GtkTextView where gtkContainer tv = tv
 
 newTextView :: State GtkState GtkTextView
-newTextView =
-	toStateR 'I'.gtk_text_view_new >>= \text_view ->
-	toState ('I'.gtk_widget_show text_view) >>|
-	pure text_view
+newTextView = toStateR 'I'.gtk_text_view_new >>= show
 
 getTextBuffer :: !GtkTextView -> GtkTextBuffer
 getTextBuffer text_view = 'I'.gtk_text_view_get_buffer text_view
@@ -83,5 +97,4 @@ new_window_or_popup is_popup title size =
 	(case size of
 		Nothing    -> pure ()
 		Just (h,v) -> toState ('I'.gtk_widget_set_size_request window h v)) >>|
-	toState ('I'.gtk_widget_show window) >>|
-	pure window
+	show window
-- 
cgit v1.2.3