Merge remote-tracking branch 'origin/ui' into tessallation

2014-03-17 19:02:51 +01:00
parent 9aad31d9ec 2de621d73f
commit fd38727c65
5 changed files with 109 additions and 4 deletions
--- a/src/Main.hs
+++ b/src/Main.hs
@ -42,6 +42,7 @@ import           Render.Misc                          (checkError,
 import           Render.Render                        (initRendering,
                                                       initShader)
 import           UI.Callbacks
+import           UI.GUIOverlay
 import           Types

 import qualified Debug.Trace                          as D (trace)
@ -55,7 +56,7 @@ main = do
                                                                             ,WindowResizable  -- and resizable 
                                                                             ,WindowInputFocus -- focused (=> active)
                                                                             ,WindowMouseFocus -- Mouse into it
-                                                                             ,WindowInputGrabbed-- never let go of input (KB/Mouse)
+                                                                             --,WindowInputGrabbed-- never let go of input (KB/Mouse)
                                                                             ] $ \window -> do
        withOpenGL window $ do
        --TTF.withInit $ do