From 8af85096ff29f3815f1bee57cc5f4c25bb62611d Mon Sep 17 00:00:00 2001
From: ZeroByteOrg <thatguy@zerobyte.org>
Date: Thu, 26 May 2022 13:28:18 -0500
Subject: [PATCH] Fixed incorrect conflict-resolution in gui.cpp line 3049

---
 src/gui/gui.cpp | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
index 4196123c7..dd622d2a0 100644
--- a/src/gui/gui.cpp
+++ b/src/gui/gui.cpp
@@ -3055,39 +3055,8 @@ bool FurnaceGUI::loop() {
     }
 
     if (mobileUI) {
-      ImGuiViewport* mainView=ImGui::GetMainViewport();
-      ImGui::SetNextWindowPos(mainView->Pos);
-      ImGui::SetNextWindowSize(mainView->Size);
-      ImGui::SetNextWindowViewport(mainView->ID);
-      ImGuiID dockID=ImGui::GetID("MobileUISpace");
-      ImGuiWindowFlags muiFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoCollapse|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoDocking|ImGuiWindowFlags_NoBringToFrontOnFocus|ImGuiWindowFlags_NoNavFocus;
-      ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
-      ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
-      ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-      ImGui::Begin("MobileUI",NULL,muiFlags);
-      ImGui::PopStyleVar(3);
-      if (ImGui::DockBuilderGetNode(dockID)==NULL) {
-        ImGui::DockBuilderRemoveNode(dockID);
-        ImGuiID dn=ImGui::DockBuilderAddNode(dockID);
-        ImGuiID upper, lower, left, right;
-        ImGui::DockBuilderSplitNode(dn,ImGuiDir_Left,0.1f,&left,&right);
-        ImGui::DockBuilderSplitNode(right,ImGuiDir_Down,0.2f,&lower,&upper);
-        ImGui::DockBuilderDockWindow("Mobile Controls",left);
-        ImGui::DockBuilderDockWindow("Pattern",upper);
-        ImGui::DockBuilderDockWindow("Piano",lower);
-        ImGui::DockBuilderFinish(dn);
-      }
-      ImGui::DockSpace(dockID);
-      ImGui::End();
-
-      if (ImGui::Begin("Mobile Controls")) {
-        ImGui::Text("Hi!");
-        if (ImGui::Button("Get me out of here")) {
-          toggleMobileUI(false);
-        }
-      }
-      ImGui::End();
-
+      globalWinFlags=ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoMove|ImGuiWindowFlags_NoResize|ImGuiWindowFlags_NoBringToFrontOnFocus;
+      drawMobileControls();
       drawPattern();
       drawPiano();
     } else {