Added definitions for ImageButton with explicit ID (#266)

SFML · Dec 7, 2023 · 125081b · 125081b
1 parent 286d34c
commit 125081b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 44 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
       with:
         repository: ocornut/imgui
         path: imgui
-        ref: v1.87
+        ref: v1.89
 
     - name: Checkout SFML
       uses: actions/checkout@v3

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,7 +38,7 @@ if(NOT IMGUI_DIR)
 endif()
 
 # This uses FindImGui.cmake provided in ImGui-SFML repo for now
-find_package(ImGui 1.87 REQUIRED)
+find_package(ImGui 1.89 REQUIRED)
 
 # These headers will be installed alongside ImGui-SFML
 set(IMGUI_PUBLIC_HEADERS

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ Dependencies
 -----
 
 * [SFML](https://github.com/SFML/SFML) >= 2.5.0
-* [Dear ImGui](https://github.com/ocornut/imgui) >= 1.87
+* [Dear ImGui](https://github.com/ocornut/imgui) >= 1.89
 
 Contributing
 -----

diff --git a/imgui-SFML.cpp b/imgui-SFML.cpp
@@ -726,47 +726,30 @@ void Image(const sf::Sprite& sprite, const sf::Vector2f& size, const sf::Color&
 
 /////////////// Image Button Overloads for sf::Texture
 
-bool ImageButton(const sf::Texture& texture, const int framePadding, const sf::Color& bgColor,
-                 const sf::Color& tintColor) {
-    return ImageButton(texture, sf::Vector2f(texture.getSize()), framePadding, bgColor, tintColor);
-}
-
-bool ImageButton(const sf::Texture& texture, const sf::Vector2f& size, const int framePadding,
+bool ImageButton(const char* id, const sf::Texture& texture, const sf::Vector2f& size,
                  const sf::Color& bgColor, const sf::Color& tintColor) {
     ImTextureID textureID = convertGLTextureHandleToImTextureID(texture.getNativeHandle());
 
-    return ImGui::ImageButton(textureID, ImVec2(size.x, size.y), ImVec2(0, 0), ImVec2(1, 1),
-                              framePadding, toImColor(bgColor), toImColor(tintColor));
+    return ImGui::ImageButton(id, textureID, ImVec2(size.x, size.y), ImVec2(0, 0), ImVec2(1, 1),
+                              toImColor(bgColor), toImColor(tintColor));
 }
 
 /////////////// Image Button Overloads for sf::RenderTexture
 
-bool ImageButton(const sf::RenderTexture& texture, const int framePadding, const sf::Color& bgColor,
-                 const sf::Color& tintColor) {
-    return ImageButton(texture, sf::Vector2f(texture.getSize()), framePadding, bgColor, tintColor);
-}
-
-bool ImageButton(const sf::RenderTexture& texture, const sf::Vector2f& size, const int framePadding,
+bool ImageButton(const char* id, const sf::RenderTexture& texture, const sf::Vector2f& size,
                  const sf::Color& bgColor, const sf::Color& tintColor) {
     ImTextureID textureID =
         convertGLTextureHandleToImTextureID(texture.getTexture().getNativeHandle());
 
-    return ImGui::ImageButton(textureID, ImVec2(size.x, size.y), ImVec2(0, 1),
+    return ImGui::ImageButton(id, textureID, ImVec2(size.x, size.y), ImVec2(0, 1),
                               ImVec2(1, 0), // flipped vertically, because textures in
                                             // sf::RenderTexture are stored this way
-                              framePadding, toImColor(bgColor), toImColor(tintColor));
+                              toImColor(bgColor), toImColor(tintColor));
 }
 
 /////////////// Image Button Overloads for sf::Sprite
 
-bool ImageButton(const sf::Sprite& sprite, const int framePadding, const sf::Color& bgColor,
-                 const sf::Color& tintColor) {
-    const sf::FloatRect spriteSize = sprite.getGlobalBounds();
-    return ImageButton(sprite, sf::Vector2f(spriteSize.width, spriteSize.height), framePadding,
-                       bgColor, tintColor);
-}
-
-bool ImageButton(const sf::Sprite& sprite, const sf::Vector2f& size, const int framePadding,
+bool ImageButton(const char* id, const sf::Sprite& sprite, const sf::Vector2f& size,
                  const sf::Color& bgColor, const sf::Color& tintColor) {
     const sf::Texture* texturePtr = sprite.getTexture();
     // sprite without texture cannot be drawn
@@ -781,8 +764,8 @@ bool ImageButton(const sf::Sprite& sprite, const sf::Vector2f& size, const int f
                      (textureRect.top + textureRect.height) / textureSize.y);
 
     ImTextureID textureID = convertGLTextureHandleToImTextureID(texture.getNativeHandle());
-    return ImGui::ImageButton(textureID, ImVec2(size.x, size.y), uv0, uv1, framePadding,
-                              toImColor(bgColor), toImColor(tintColor));
+    return ImGui::ImageButton(id, textureID, ImVec2(size.x, size.y), uv0, uv1, toImColor(bgColor),
+                              toImColor(tintColor));
 }
 
 /////////////// Draw_list Overloads

diff --git a/imgui-SFML.h b/imgui-SFML.h
@@ -106,29 +106,19 @@ IMGUI_SFML_API void Image(const sf::Sprite& sprite, const sf::Vector2f& size,
                           const sf::Color& borderColor = sf::Color::Transparent);
 
 // ImageButton overloads for sf::Texture
-IMGUI_SFML_API bool ImageButton(const sf::Texture& texture, int framePadding = -1,
-                                const sf::Color& bgColor = sf::Color::Transparent,
-                                const sf::Color& tintColor = sf::Color::White);
-IMGUI_SFML_API bool ImageButton(const sf::Texture& texture, const sf::Vector2f& size,
-                                int framePadding = -1,
+IMGUI_SFML_API bool ImageButton(const char* id, const sf::Texture& texture,
+                                const sf::Vector2f& size,
                                 const sf::Color& bgColor = sf::Color::Transparent,
                                 const sf::Color& tintColor = sf::Color::White);
 
 // ImageButton overloads for sf::RenderTexture
-IMGUI_SFML_API bool ImageButton(const sf::RenderTexture& texture, int framePadding = -1,
-                                const sf::Color& bgColor = sf::Color::Transparent,
-                                const sf::Color& tintColor = sf::Color::White);
-IMGUI_SFML_API bool ImageButton(const sf::RenderTexture& texture, const sf::Vector2f& size,
-                                int framePadding = -1,
+IMGUI_SFML_API bool ImageButton(const char* id, const sf::RenderTexture& texture,
+                                const sf::Vector2f& size,
                                 const sf::Color& bgColor = sf::Color::Transparent,
                                 const sf::Color& tintColor = sf::Color::White);
 
 // ImageButton overloads for sf::Sprite
-IMGUI_SFML_API bool ImageButton(const sf::Sprite& sprite, int framePadding = -1,
-                                const sf::Color& bgColor = sf::Color::Transparent,
-                                const sf::Color& tintColor = sf::Color::White);
-IMGUI_SFML_API bool ImageButton(const sf::Sprite& sprite, const sf::Vector2f& size,
-                                int framePadding = -1,
+IMGUI_SFML_API bool ImageButton(const char* id, const sf::Sprite& sprite, const sf::Vector2f& size,
                                 const sf::Color& bgColor = sf::Color::Transparent,
                                 const sf::Color& tintColor = sf::Color::White);