dockspaceId

Author: malucard

src/core/arguments.cc

@@ -33,7 +33,7 @@ PCSX::Arguments::Arguments(const CommandLine::args& args) {
     auto portablePath = args.get<std::string_view>("portable");
     if (portablePath.has_value()) m_portablePath = portablePath.value();
     if (std::filesystem::exists("pcsx.json")) m_portable = true;
-    if (std::filesystem::exists("Makefile")) m_portable = true;
+    if (std::filesystem::exists(std::filesystem::path("vsprojects") / "pcsx-redux.sln")) m_portable = true;
     if (std::filesystem::exists(std::filesystem::path("..") / "pcsx-redux.sln")) m_portable = true;
     if (args.get<bool>("safe") || args.get<bool>("testmode") || args.get<bool>("cli")) m_safeModeEnabled = true;
     if (args.get<bool>("resetui")) m_uiResetRequested = true;

src/gui/gui.cc

@@ -1127,12 +1127,12 @@ void PCSX::GUI::endFrame() {
     m_offscreenShaderEditor.configure(this);
     m_outputShaderEditor.configure(this);
 
-    ImGuiID dockspace = ImGui::DockSpaceOverViewport(0, nullptr, ImGuiDockNodeFlags_PassthruCentralNode);
+    ImGuiID dockspaceId = ImGui::DockSpaceOverViewport(0, nullptr, ImGuiDockNodeFlags_PassthruCentralNode);
     ImGuiContext* context = ImGui::GetCurrentContext();
-    ImGuiDockNode* dockspaceNode = ImGui::DockContextFindNodeByID(context, dockspace);
+    ImGuiDockNode* dockspaceNode = ImGui::DockContextFindNodeByID(context, dockspaceId);
     if (m_fullWindowRender && !dockspaceNode->IsEmpty()) {
         m_fullWindowRender = false;
-        ImGui::SetNextWindowDockID(dockspace);
+        ImGui::SetNextWindowDockID(dockspaceId);
     }
     if (m_fullWindowRender) {
         ImTextureID texture = m_offscreenTextures[m_currentTexture];
@@ -1186,7 +1186,7 @@ void PCSX::GUI::endFrame() {
         if (!outputWindowShown) {
             m_fullWindowRender = true;
             // full window render mode can't have anything docked in the dockspace
-            ImGui::DockContextClearNodes(context, dockspace, true);
+            ImGui::DockContextClearNodes(context, dockspaceId, true);
         }
     }
 
@@ -1451,7 +1451,7 @@ in Configuration->Emulation, restart PCSX-Redux, then try again.)"));
                     if (ImGui::MenuItem(_("Full window render"), nullptr, &m_fullWindowRender)) {
                         m_setupScreenSize = true;
                         // full window render mode can't have anything docked in the dockspace
-                        ImGui::DockContextClearNodes(context, dockspace, true);
+                        ImGui::DockContextClearNodes(context, dockspaceId, true);
                     }
                     if (ImGui::MenuItem(_("Fullscreen"), nullptr, &m_fullscreen)) {
                         setFullscreen(m_fullscreen);