diff --git a/ChangeLog.md b/ChangeLog.md index 901ee38..e467802 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,9 @@ # Changelog for dear-imgui +## [1.1.0] + +- `imgui` updated to 1.84.2. + ## [1.0.2] - Added `withID` and `ToID(..)` to make composable components possible. diff --git a/Main.hs b/Main.hs index 951ff99..2fe3afa 100644 --- a/Main.hs +++ b/Main.hs @@ -57,7 +57,7 @@ loop w checked color slider r pos size' selected tab1Ref tab2Ref = do quit <- pollEvents openGL3NewFrame - sdl2NewFrame w + sdl2NewFrame newFrame -- showDemoWindow diff --git a/README.md b/README.md index b805728..b32f884 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ mainLoop w = do -- Tell ImGui we're starting a new frame openGL2NewFrame - sdl2NewFrame w + sdl2NewFrame newFrame -- Build the GUI diff --git a/dear-imgui.cabal b/dear-imgui.cabal index ca023f4..d49f8d7 100644 --- a/dear-imgui.cabal +++ b/dear-imgui.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: dear-imgui -version: 1.0.2 +version: 1.1.0 author: Oliver Charles maintainer: ollie@ocharles.org.uk, aenor.realm@gmail.com license: BSD-3-Clause diff --git a/examples/Readme.hs b/examples/Readme.hs index 61714d8..7aa3476 100644 --- a/examples/Readme.hs +++ b/examples/Readme.hs @@ -51,7 +51,7 @@ mainLoop w = do -- Tell ImGui we're starting a new frame openGL2NewFrame - sdl2NewFrame w + sdl2NewFrame newFrame -- Build the GUI diff --git a/examples/vulkan/Main.hs b/examples/vulkan/Main.hs index 61cd63b..270da70 100644 --- a/examples/vulkan/Main.hs +++ b/examples/vulkan/Main.hs @@ -342,7 +342,7 @@ app = do else handleJust vulkanException ( pure . reloadQuit ) do ImGui.Vulkan.vulkanNewFrame - ImGui.SDL.sdl2NewFrame window + ImGui.SDL.sdl2NewFrame ImGui.newFrame ImGui.showDemoWindow ImGui.render diff --git a/imgui b/imgui index ad5d1a8..e3e1fbc 160000 --- a/imgui +++ b/imgui @@ -1 +1 @@ -Subproject commit ad5d1a8429ea219d3d34e6a36a48918650402697 +Subproject commit e3e1fbcf025cf83413815751f7c33500e1314d57 diff --git a/src/DearImGui/SDL.hs b/src/DearImGui/SDL.hs index 76aa126..b67e39c 100644 --- a/src/DearImGui/SDL.hs +++ b/src/DearImGui/SDL.hs @@ -40,7 +40,6 @@ import qualified Language.C.Inline.Cpp as Cpp -- sdl2 import SDL -import SDL.Internal.Types import SDL.Raw.Enum as Raw import qualified SDL.Raw.Event as Raw @@ -57,9 +56,9 @@ Cpp.using "namespace ImGui" -- | Wraps @ImGui_ImplSDL2_NewFrame@. -sdl2NewFrame :: MonadIO m => Window -> m () -sdl2NewFrame (Window windowPtr) = liftIO do - [C.exp| void { ImGui_ImplSDL2_NewFrame((SDL_Window*)($(void* windowPtr))); } |] +sdl2NewFrame :: MonadIO m => m () +sdl2NewFrame = liftIO do + [C.exp| void { ImGui_ImplSDL2_NewFrame(); } |] -- | Wraps @ImGui_ImplSDL2_Shutdown@.