fixes

pthom · Jan 3, 2024 · 681afd6 · 681afd6
1 parent de08c5c
commit 681afd6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/hello_imgui/internal/backend_impls/abstract_runner.cpp b/src/hello_imgui/internal/backend_impls/abstract_runner.cpp
@@ -508,6 +508,7 @@ void AbstractRunner::RenderGui()
 
     if (params.appWindowParams.borderless) // Need to add params.appWindowParams.borderlessResizable
     {
+#if !defined(HELLOIMGUI_MOBILEDEVICE) && !defined(__EMSCRIPTEN__)
         bool shouldClose = HandleBorderlessMovable(mWindow,
                                 mBackendWindowHelper.get(),
                                 params.appWindowParams.borderlessMovable,
@@ -517,6 +518,7 @@ void AbstractRunner::RenderGui()
         );
         if (shouldClose)
             params.appShallExit = true;
+#endif
     }
 
     if (params.callbacks.ShowGui)

diff --git a/src/hello_imgui/internal/borderless_movable.cpp b/src/hello_imgui/internal/borderless_movable.cpp
@@ -76,7 +76,7 @@ namespace HelloImGui
                 ImRect btnArea(btnPos, btnPos + btnSize);
 
                 auto colorButton = ImGui::GetColorU32(ImGuiCol_Button, 0.95f);
-                colorButton = 0xFF000099;
+                colorButton = 0xFF0000BB;
                 ImGui::GetForegroundDrawList()->AddCircleFilled(
                     btnArea.GetCenter(),
                     btnSize.x * 0.5f,

diff --git a/.../hello_imgui_demodocking/assets/world.png → ...imgui_demodocking/assets/images/world.png b/.../hello_imgui_demodocking/assets/world.png → ...imgui_demodocking/assets/images/world.png
diff --git a/src/hello_imgui_demos/hello_imgui_demodocking/hello_imgui_demodocking.main.cpp b/src/hello_imgui_demos/hello_imgui_demodocking/hello_imgui_demodocking.main.cpp
@@ -296,7 +296,7 @@ void DemoAssets(AppState& appState)
     ImGui::Dummy(HelloImGui::EmToVec2(0.f, 0.45f));
     ImGui::Text("Hello");
     HelloImGui::EndGroupColumn();
-    HelloImGui::ImageFromAsset("world.png", HelloImGui::EmToVec2(2.5f, 2.5f));
+    HelloImGui::ImageFromAsset("images/world.png", HelloImGui::EmToVec2(2.5f, 2.5f));
 }
 
 void DemoFonts(AppState& appState)
@@ -313,20 +313,20 @@ void DemoFonts(AppState& appState)
     {
         ImGui::PushFont(appState.EmojiFont);
         // ✌️ (Victory Hand Emoji)
-        ImGui::Text(u8"\U0000270C\U0000FE0F");
+        ImGui::Text("\U0000270C\U0000FE0F");
         ImGui::SameLine();
 
         // ❤️ (Red Heart Emoji)
-        ImGui::Text(u8"\U00002764\U0000FE0F");
+        ImGui::Text("\U00002764\U0000FE0F");
         ImGui::SameLine();
 
 #ifdef IMGUI_USE_WCHAR32
         // 🌴 (Palm Tree Emoji)
-        ImGui::Text(u8"\U0001F334");
+        ImGui::Text("\U0001F334");
         ImGui::SameLine();
 
         // 🚀 (Rocket Emoji)
-        ImGui::Text(u8"\U0001F680");
+        ImGui::Text("\U0001F680");
         ImGui::SameLine();
 #endif