use new ImGui::ImageButton API

pthom · Sep 10, 2024 · 3255497 · 3255497
1 parent 767971d
commit 3255497
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/immvision/internal/drawing/internal_icons.cpp b/src/immvision/internal/drawing/internal_icons.cpp
@@ -305,11 +305,11 @@ namespace ImmVision
             ImmVision::Image("test2", img, &imageParams2);
 
             ImVec2 iconSize(15.f, 15.f);
-            ImGui::ImageButton(GetIcon(IconType::ZoomScaleOne), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomPlus), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomMinus), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomFullView), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::AdjustLevels), iconSize);
+            ImGui::ImageButton("ZoomScaleOne", GetIcon(IconType::ZoomScaleOne), iconSize);
+            ImGui::ImageButton("ZoomPlus", GetIcon(IconType::ZoomPlus), iconSize);
+            ImGui::ImageButton("ZoomMinus", GetIcon(IconType::ZoomMinus), iconSize);
+            ImGui::ImageButton("ZoomFullView", GetIcon(IconType::ZoomFullView), iconSize);
+            ImGui::ImageButton("AdjustLevels", GetIcon(IconType::AdjustLevels), iconSize);
         }
 
         void ClearIconsTextureCache()

diff --git a/src/immvision/internal/gl/gl_texture.cpp b/src/immvision/internal/gl/gl_texture.cpp
@@ -30,7 +30,9 @@ namespace ImmVision
         ImVec2 size_(size);
         if (size.x == 0.f)
             size_ = this->mImageSize;
-        return ImGui::ImageButton(this->mImTextureId, size_, uv0, uv1, frame_padding, bg_col, tint_col);
+        char id[64];
+        snprintf(id, 64, "##%p", this->mImTextureId);
+        return ImGui::ImageButton(id, this->mImTextureId, size_, uv0, uv1, bg_col, tint_col);
     }
 
     void GlTexture::Draw_DisableDragWindow(const ImVec2 &size, bool disableDragWindow) const

diff --git a/src_all_in_one/immvision/immvision.cpp b/src_all_in_one/immvision/immvision.cpp
@@ -7015,11 +7015,11 @@ namespace ImmVision
             ImmVision::Image("test2", img, &imageParams2);
 
             ImVec2 iconSize(15.f, 15.f);
-            ImGui::ImageButton(GetIcon(IconType::ZoomScaleOne), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomPlus), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomMinus), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::ZoomFullView), iconSize);
-            ImGui::ImageButton(GetIcon(IconType::AdjustLevels), iconSize);
+            ImGui::ImageButton("ZoomScaleOne", GetIcon(IconType::ZoomScaleOne), iconSize);
+            ImGui::ImageButton("ZoomPlus", GetIcon(IconType::ZoomPlus), iconSize);
+            ImGui::ImageButton("ZoomMinus", GetIcon(IconType::ZoomMinus), iconSize);
+            ImGui::ImageButton("ZoomFullView", GetIcon(IconType::ZoomFullView), iconSize);
+            ImGui::ImageButton("AdjustLevels", GetIcon(IconType::AdjustLevels), iconSize);
         }
 
         void ClearIconsTextureCache()
@@ -7220,7 +7220,9 @@ namespace ImmVision
         ImVec2 size_(size);
         if (size.x == 0.f)
             size_ = this->mImageSize;
-        return ImGui::ImageButton(this->mImTextureId, size_, uv0, uv1, frame_padding, bg_col, tint_col);
+        char id[64];
+        snprintf(id, 64, "##%p", this->mImTextureId);
+        return ImGui::ImageButton(id, this->mImTextureId, size_, uv0, uv1, bg_col, tint_col);
     }
 
     void GlTexture::Draw_DisableDragWindow(const ImVec2 &size, bool disableDragWindow) const