updated deps

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "imgui"]
 	path = imgui
-	url = https://github.com/ocornut/imgui
+	url = https://github.com/Drezil/imgui
+  branch = textAlign

dear-imgui.cabal

@@ -13,11 +13,10 @@ description:
   Set package flags according to your needs.
 
 build-type: Simple
-extra-source-files:
-  README.md,
-  ChangeLog.md
 
 extra-source-files:
+  README.md,
+  ChangeLog.md,
   imgui/*.h,
   imgui/backends/*.h,
   imgui/backends/*.mm,
@@ -157,6 +156,7 @@ library
   import: common
   hs-source-dirs:
     src
+    generator
   exposed-modules:
     DearImGui
     DearImGui.FontAtlas
@@ -172,6 +172,13 @@ library
   other-modules:
     DearImGui.Enums
     DearImGui.Structs
+    DearImGui.Generator
+    DearImGui.Generator.Parser
+    DearImGui.Generator.Tokeniser
+    DearImGui.Generator.Types
+  ghc-options:
+    -static -dynamic-too
+    -- create both libHSdear-imgui... .a and .so
   cxx-options: -std=c++11
   cxx-sources:
     imgui/imgui.cpp
@@ -179,6 +186,12 @@ library
     imgui/imgui_draw.cpp
     imgui/imgui_tables.cpp
     imgui/imgui_widgets.cpp
+  install-includes:
+    imgui.h
+    imgui_internal.h
+    imstb_rectpack.h
+    imstb_textedit.h
+    imstb_truetype.h
   if impl(ghc >= 9.4)
     build-depends: system-cxx-std-lib
   else
@@ -186,15 +199,38 @@ library
   include-dirs:
     imgui
   build-depends:
-      dear-imgui-generator
+      containers
-    , containers
     , managed
     , inline-c
     , inline-c-cpp
     , StateVar
     , unliftio
     , vector
+    -- for the generator:
+    , template-haskell
+        >= 2.15 && < 2.19
+    , containers
+       ^>= 0.6.2.1
+    , directory
+        >= 1.3 && < 1.4
+    , filepath
+        >= 1.4 && < 1.5
+    , inline-c
+        >= 0.9.0.0 && < 0.10
+    , megaparsec
+        >= 9.0 && < 9.3
+    , parser-combinators
+        >= 1.2.0 && < 1.4
+    , scientific
+        >= 0.3.6.2 && < 0.3.8
     , text
+        >= 1.2.4 && < 2.1
+    , th-lift
+        >= 0.7 && < 0.9
+    , transformers
+        >= 0.5.6 && < 0.6
+    , unordered-containers
+        >= 0.2.11 && < 0.3
 
   if os(darwin)
     ghc-options:
@@ -298,40 +334,6 @@ library
       exposed-modules:
         DearImGui.GLFW.Vulkan
 
-library dear-imgui-generator
-  import: common
-  hs-source-dirs: generator
-  exposed-modules:
-      DearImGui.Generator
-    , DearImGui.Generator.Parser
-    , DearImGui.Generator.Tokeniser
-    , DearImGui.Generator.Types
-  build-depends:
-      template-haskell
-        >= 2.15 && < 2.21
-    , containers
-       ^>= 0.6.2.1
-    , directory
-        >= 1.3 && < 1.4
-    , filepath
-        >= 1.4 && < 1.5
-    , inline-c
-        >= 0.9.0.0 && < 0.10
-    , megaparsec
-        >= 9.0 && < 9.4
-    , parser-combinators
-        >= 1.2.0 && < 1.4
-    , scientific
-        >= 0.3.6.2 && < 0.3.8
-    , text
-        >= 1.2.4 && < 2.1
-    , th-lift
-        >= 0.7 && < 0.9
-    , transformers
-        >= 0.5.6 && < 0.7
-    , unordered-containers
-        >= 0.2.11 && < 0.3
-
 executable test
   import: common, exe-flags
   main-is: Main.hs
@@ -346,7 +348,7 @@ executable glfw
   main-is: Main.hs
   hs-source-dirs: examples/glfw
   default-language: Haskell2010
-  if (!flag(examples) || !flag(glfw) || !flag(opengl2))
+  if (!flag(examples) || !flag(glfw) || !(flag(opengl3) || flag(opengl2)))
     buildable: False
   else
     build-depends: base, GLFW-b, gl, dear-imgui, managed, text

src/DearImGui/Raw/DrawList.hs

@@ -412,8 +412,8 @@ addText_ (DrawList drawList) pos col text_begin text_end = liftIO do
     }
   |]
 
-addText :: MonadIO m => DrawList -> Ptr ImFont -> CFloat -> Ptr ImVec2 -> ImU32 -> CString -> CString -> CFloat -> Ptr ImVec4 -> m ()
+addText :: MonadIO m => DrawList -> Ptr ImFont -> CFloat -> Ptr ImVec2 -> ImU32 -> CString -> CString -> CFloat -> CFloat -> Ptr ImVec4 -> m ()
-addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_width cpu_fine_clip_rect = liftIO do
+addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_width text_align cpu_fine_clip_rect = liftIO do
   [C.block|
     void {
       $(ImDrawList* drawList)->AddText(
@@ -424,6 +424,7 @@ addText (DrawList drawList) fontPtr font_size pos col text_begin text_end wrap_w
         $(char* text_begin),
         $(char* text_end),
         $(float wrap_width),
+        $(float text_align),
         $(ImVec4* cpu_fine_clip_rect)
       );
     }