Merge branch 'ui' into tessallation

2014-05-15 15:19:02 +02:00
parent d83c87db1d 45fe3f8493
commit 5b9378c317
5 changed files with 82 additions and 19 deletions
--- a/src/Main.hs
+++ b/src/Main.hs
@ -45,6 +45,7 @@ import           UI.Callbacks
 import           Map.Graphics
 import           Map.Creation                          (exportedMap)
 import           Types
+import qualified UI.UIBase as UI
 import           Importer.IQM.Parser
 --import           Data.Attoparsec.Char8 (parseTest)
 --import qualified Data.ByteString as B
@ -161,6 +162,7 @@ main =
                        { _uiHasChanged        = True
                        , _uiMap = guiMap
                        , _uiRoots = guiRoots
+                        , _uiButtonState = UI.UIButtonState 0 Nothing
                        }
              }