From 4c98ccde118f4dd0503226154876001bfc2770f7 Mon Sep 17 00:00:00 2001
From: Joe Crayne <joe@jerkface.net>
Date: Mon, 29 Apr 2019 20:13:49 -0400
Subject: MeshSketch.new now returns a widget.

---
 MeshSketch.hs |  4 ++--
 mainObj.hs    | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/MeshSketch.hs b/MeshSketch.hs
index c56d34f..9c6c457 100644
--- a/MeshSketch.hs
+++ b/MeshSketch.hs
@@ -111,7 +111,7 @@ data Realized = Realized
     , stState    :: State
     }
 
-new :: IO MeshSketch
+new :: IO GLArea
 new = do
     m <- do
         objName <- head . (++ ["cube.obj"]) <$> getArgs
@@ -143,7 +143,7 @@ new = do
             _ <- on g #realize       $ withCurrentGL g (onRealize obj (dynamicPipeline pipeline) (dynamicSchema pipeline) mm)
             _ <- on g #unrealize     $ onUnrealize mm
             -- _ <- on g #createContext $ nullableContext (glCreateContext w st)
-            return mm
+            return g
 
 onUnrealize :: MeshSketch -> IO ()
 onUnrealize mm = do
diff --git a/mainObj.hs b/mainObj.hs
index caf6501..133643f 100644
--- a/mainObj.hs
+++ b/mainObj.hs
@@ -11,19 +11,19 @@ import qualified MeshSketch
 
 main :: IO ()
 main = do
-        _ <- Gtk.init Nothing
+    _ <- Gtk.init Nothing
 
-        let mkChild = MeshSketch.mmWidget <$> MeshSketch.new
+    let mkChild = MeshSketch.new
 
-        window <- do
-            w <- Gtk.windowNew WindowTypeToplevel
-            windowSetDefaultSize    w 720 720
-            Gtk.windowSetTitle      w "MeshSketch"
-            containerSetBorderWidth w 0
-            _ <- on w #deleteEvent $ \_ -> mainQuit >> return True
-            child <- mkChild
-            containerAdd w child
-            return w
+    window <- do
+        w <- windowNew WindowTypeToplevel
+        windowSetDefaultSize    w 720 720
+        windowSetTitle          w "MeshSketch"
+        containerSetBorderWidth w 0
+        _ <- on w #deleteEvent $ \_ -> mainQuit >> return True
+        child <- mkChild
+        containerAdd w child
+        return w
 
-        widgetShowAll window
-        Gtk.main
+    widgetShowAll window
+    Gtk.main
-- 
cgit v1.2.3