[hello-imgui] update to v1.6.0 (#42343)

This commit is contained in:
Pascal Thomet 2024-11-25 21:37:02 +01:00 committed by GitHub
parent 2cf1e05bd9
commit 9eb5b23bca
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 9 additions and 49 deletions

View File

@ -1,13 +0,0 @@
diff --git a/src/hello_imgui/internal/poor_man_log.cpp b/src/hello_imgui/internal/poor_man_log.cpp
index 3aad6f7..e9e474b 100644
--- a/src/hello_imgui/internal/poor_man_log.cpp
+++ b/src/hello_imgui/internal/poor_man_log.cpp
@@ -18,7 +18,7 @@ void PoorManLog(const char* msg, ...)
va_end(args);
#ifdef _MSC_VER
- OutputDebugString(buffer);
+ OutputDebugStringA(buffer);
#else
printf("%s", buffer);
#endif

View File

@ -4,11 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO pthom/hello_imgui
REF "v${VERSION}"
SHA512 cc39a7d1a6b360afb26305bcca4d4c83fce69fb7babc26e452160985c127771b24b51de7c1a85c53b93e6fa1bc87bfc7a57e6fb7216e5bf4136c449771d8bcc4
SHA512 b44741e27278974f6a545a3143abd18027d98503cc912085e08528c467197fb208d2d4876e483f74e518f3dfc14d12c3579e379b9939dc364a1fff4ee98bb8f5
HEAD_REF master
PATCHES
fix-upw.patch
use-new-imguiimagebutton.patch # Upstream commit: https://github.com/pthom/hello_imgui/commit/3ba369ad5b9bc281f01a2b2ee78d64ecef7d632a
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

View File

@ -1,28 +0,0 @@
diff --git a/src/hello_imgui/internal/image_from_asset.cpp b/src/hello_imgui/internal/image_from_asset.cpp
index 7416a69..b838d88 100644
--- a/src/hello_imgui/internal/image_from_asset.cpp
+++ b/src/hello_imgui/internal/image_from_asset.cpp
@@ -116,7 +116,7 @@ namespace HelloImGui
auto textureId = cachedImage->TextureID();
auto imageSize = ImVec2((float)cachedImage->Width, (float)cachedImage->Height);
ImVec2 displayedSize = ImageProportionalSize(size, imageSize);
- bool clicked = ImGui::ImageButton(textureId, displayedSize, uv0, uv1, frame_padding, bg_col, tint_col);
+ bool clicked = ImGui::ImageButton(assetPath, textureId, displayedSize, uv0, uv1, bg_col, tint_col);
return clicked;
}
diff --git a/src/hello_imgui/internal/image_gl_deprecated.cpp b/src/hello_imgui/internal/image_gl_deprecated.cpp
index 5c66c24..98d21d5 100644
--- a/src/hello_imgui/internal/image_gl_deprecated.cpp
+++ b/src/hello_imgui/internal/image_gl_deprecated.cpp
@@ -67,7 +67,9 @@ bool ImageGl::DrawButton(
const ImVec4& tint_col)
{
ImVec2 displayedSize = ImageProportionalSize(size, this->imageSize);
- return ImGui::ImageButton(this->imTextureId, displayedSize, uv0, uv1, frame_padding, bg_col, tint_col);
+ char str_id[64];
+ snprintf(str_id, 64, "ImageButton_%p", this->imTextureId);
+ return ImGui::ImageButton(str_id, this->imTextureId, displayedSize, uv0, uv1, bg_col, tint_col);
}
ImageGlPtr ImageGl::FactorImage(const char *assetPath)

View File

@ -1,7 +1,6 @@
{
"name": "hello-imgui",
"version": "1.5.2",
"port-version": 1,
"version": "1.6.0",
"description": "Hello ImGui: unleash your creativity in app development and prototyping",
"homepage": "https://pthom.github.io/hello_imgui/",
"license": "MIT",

View File

@ -3477,8 +3477,8 @@
"port-version": 0
},
"hello-imgui": {
"baseline": "1.5.2",
"port-version": 1
"baseline": "1.6.0",
"port-version": 0
},
"hexl": {
"baseline": "1.2.5",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4a401a4fdbe63f61272ac09ef44f9a8cdcd74537",
"version": "1.6.0",
"port-version": 0
},
{
"git-tree": "27ecee76fa1cedbd63a469064892c8b6f10a4e4f",
"version": "1.5.2",