diff --git a/3rdparty/dear-imgui/imgui_user.h b/3rdparty/dear-imgui/imgui_user.h index b6b57aa23..c7a4f51c3 100644 --- a/3rdparty/dear-imgui/imgui_user.h +++ b/3rdparty/dear-imgui/imgui_user.h @@ -14,7 +14,7 @@ namespace ImGui }; }; - void PushFont(Font::Enum _font); + void PushFont(Font::Enum _font, float _fontSizeBaseUnscaled = 0.0f); // BK - simple string class for convenience. class ImString diff --git a/examples/05-instancing/instancing.cpp b/examples/05-instancing/instancing.cpp index f095f3531..bc8e80462 100644 --- a/examples/05-instancing/instancing.cpp +++ b/examples/05-instancing/instancing.cpp @@ -178,9 +178,9 @@ public: ImGui::Text("%d draw calls", bgfx::getStats()->numDraw); - ImGui::PushEnabled(instancingSupported); + ImGui::BeginDisabled(!instancingSupported); ImGui::Checkbox("Use Instancing", &m_useInstancing); - ImGui::PopEnabled(); + ImGui::EndDisabled(); ImGui::Text("Grid Side Size:"); ImGui::SliderInt("##size", (int*)&m_sideSize, 1, 512); diff --git a/examples/47-pixelformats/pixelformats.cpp b/examples/47-pixelformats/pixelformats.cpp index 56533286e..2a996bdc8 100644 --- a/examples/47-pixelformats/pixelformats.cpp +++ b/examples/47-pixelformats/pixelformats.cpp @@ -773,9 +773,9 @@ public: | BGFX_CAPS_FORMAT_TEXTURE_3D_EMULATED | BGFX_CAPS_FORMAT_TEXTURE_CUBE_EMULATED ) ); - ImGui::PushEnabled(false); + ImGui::BeginDisabled(true); ImGui::Checkbox("Emu", &emulated); - ImGui::PopEnabled(); + ImGui::EndDisabled(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) ) { @@ -784,9 +784,9 @@ public: ImGui::SameLine(); bool framebuffer = 0 != (formatFlags & BGFX_CAPS_FORMAT_TEXTURE_FRAMEBUFFER); - ImGui::PushEnabled(false); + ImGui::BeginDisabled(true); ImGui::Checkbox("FB", &framebuffer); - ImGui::PopEnabled(); + ImGui::EndDisabled(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) ) { @@ -795,9 +795,9 @@ public: ImGui::SameLine(); bool msaa = 0 != (formatFlags & BGFX_CAPS_FORMAT_TEXTURE_MSAA); - ImGui::PushEnabled(false); + ImGui::BeginDisabled(true); ImGui::Checkbox("MSAA", &msaa); - ImGui::PopEnabled(); + ImGui::EndDisabled(); if (ImGui::IsItemHovered(ImGuiHoveredFlags_AllowWhenDisabled) ) { diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp index ad97a5099..a6101a4e5 100644 --- a/examples/common/imgui/imgui.cpp +++ b/examples/common/imgui/imgui.cpp @@ -600,23 +600,9 @@ void imguiEndFrame() namespace ImGui { - void PushFont(Font::Enum _font) + void PushFont(Font::Enum _font, float _fontSizeBaseUnscaled) { - PushFont(s_ctx.m_font[_font], 0.0f); - } - - void PushEnabled(bool _enabled) - { - extern void PushItemFlag(int option, bool enabled); - PushItemFlag(ImGuiItemFlags_Disabled, !_enabled); - PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * (_enabled ? 1.0f : 0.5f) ); - } - - void PopEnabled() - { - extern void PopItemFlag(); - PopItemFlag(); - PopStyleVar(); + PushFont(s_ctx.m_font[_font], _fontSizeBaseUnscaled); } } // namespace ImGui diff --git a/examples/common/imgui/imgui.h b/examples/common/imgui/imgui.h index 749592ccf..e0c509694 100644 --- a/examples/common/imgui/imgui.h +++ b/examples/common/imgui/imgui.h @@ -133,12 +133,6 @@ namespace ImGui ; } - /// - void PushEnabled(bool _enabled); - - /// - void PopEnabled(); - } // namespace ImGui #endif // IMGUI_H_HEADER_GUARD