From fe38dabd1982686b95ab4e02aab028f12bf65e67 Mon Sep 17 00:00:00 2001 From: Jacob Domagala Date: Fri, 17 Sep 2021 17:58:38 +0200 Subject: [PATCH] [#26]: Use Begin/End Disabled after recent changes to ImGUI's API --- editor/GUI/EditorGUI.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/editor/GUI/EditorGUI.cpp b/editor/GUI/EditorGUI.cpp index 7377ae70..bbb7f6ed 100644 --- a/editor/GUI/EditorGUI.cpp +++ b/editor/GUI/EditorGUI.cpp @@ -128,8 +128,8 @@ EditorGUI::Init() void EditorGUI::Shutdown() { - ImGui_ImplOpenGL3_Shutdown(); ImGui_ImplGlfw_Shutdown(); + ImGui_ImplOpenGL3_Shutdown(); ImGui::DestroyContext(); } @@ -160,7 +160,7 @@ EditorGUI::Render() ImGui::SetNextWindowSize(ImVec2(m_windowWidth, toolsWindowHeight)); ImGui::Begin("Tools"); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4{0.45f, 0.0f, 0.2f, 0.8f}); - ImGui::PushDisabled(m_currentLevel == nullptr); + ImGui::BeginDisabled(m_currentLevel == nullptr); if (ImGui::Button("Play")) { @@ -177,7 +177,7 @@ EditorGUI::Render() m_parent.SaveLevel(levelName); } } - ImGui::PopDisabled(); + ImGui::EndDisabled(); ImGui::SameLine(); if (ImGui::Button("Load"))