Skip to content

Commit

Permalink
Fix the text fix and prepare 2.1.3 (#167)
Browse files Browse the repository at this point in the history
  • Loading branch information
dpwiz authored Dec 12, 2022
1 parent 68e30d9 commit 9bb66f0
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
7 changes: 7 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog for dear-imgui

## [2.1.3]

- Fixed off-by-1 in internal Text wrapper.
- Fixed sliderFloat* Raw calls
- Added `formatPtr` to Raw.dragFloat* and Raw.sliderFloat*

## [2.1.2]

- Fixed glfw example build flags.
Expand Down Expand Up @@ -100,6 +106,7 @@ Initial Hackage release based on [1.83].
[2.1.0]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.0
[2.1.1]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.1
[2.1.2]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.2
[2.1.3]: https://github.com/haskell-game/dear-imgui.hs/tree/v2.1.3

[1.87]: https://github.com/ocornut/imgui/releases/tag/v1.87
[1.86]: https://github.com/ocornut/imgui/releases/tag/v1.86
Expand Down
2 changes: 1 addition & 1 deletion dear-imgui.cabal
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cabal-version: 3.0

name: dear-imgui
version: 2.1.2
version: 2.1.3
author: Oliver Charles
maintainer: [email protected], [email protected]
license: BSD-3-Clause
Expand Down
9 changes: 4 additions & 5 deletions src/DearImGui/Internal/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module DearImGui.Internal.Text
) where

-- base
import Control.Monad.IO.Class (liftIO)
import Foreign (nullPtr, plusPtr)
import Foreign.C.String (CString)
import qualified GHC.Foreign as Foreign
Expand All @@ -34,7 +33,8 @@ import qualified Data.Text.Foreign as Text
withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
withCString text action =
withUnliftIO $ \(UnliftIO unlift) ->
Text.withCString text (unlift action)
Text.withCString text $ \buf ->
unlift $ action buf

#elif MIN_VERSION_text(2,0,0)
-- XXX: the text is UTF-8, alas no withCString is available
Expand All @@ -57,9 +57,8 @@ withCString t@(Text _arr _off len) action =
withCString :: MonadUnliftIO m => Text -> (CString -> m a) -> m a
withCString t action = do
withUnliftIO $ \(UnliftIO unlift) ->
liftIO $
Foreign.withCString utf8 (unpack t) $ \textPtr ->
unlift $ action textPtr
Foreign.withCString utf8 (unpack t) $ \textPtr ->
unlift $ action textPtr

#endif

Expand Down

0 comments on commit 9bb66f0

Please sign in to comment.