Fixed bugs that prevented build on Linux

nathanmillermicrostrain · nathanmillermicrostrain · commit b1fa8c5202cb · 2023-11-06T10:11:17.000-05:00
diff --git a/backends/imgui_impl_sdl2.cpp b/backends/imgui_impl_sdl2.cpp
@@ -888,7 +888,7 @@ static void ImGui_ImplSDL2_CreateWindow(ImGuiViewport* viewport)
         SDL_Window *parent_window = parent_viewport_data->Window;
         
 #ifdef __linux__
-        parent_ptr = sdl_mouse_window;
+        parent_ptr = parent_window;
 #else
         if (parent_window != nullptr)
         {
@@ -1049,8 +1049,8 @@ static void ImGui_ImplSDL2_SetWindowPos(ImGuiViewport* viewport, ImVec2 pos)
 #elif defined __linux__
     if(vd->ChildWindow != nullptr)
     {
-      pos_x = viewport->Pos.x - main_viewport->Pos.x;
-      pos_y = viewport->Pos.y - main_viewport->Pos.y;
+      pos_x = viewport->Pos.x - parent_viewport->Pos.x;
+      pos_y = viewport->Pos.y - parent_viewport->Pos.y;
        
       if(vd->ChildWindow)
       {

Original file line number	Diff line number	Diff line change
`@@ -888,7 +888,7 @@ static void ImGui_ImplSDL2_CreateWindow(ImGuiViewport* viewport)`
`888`	`888`	`SDL_Window *parent_window = parent_viewport_data->Window;`
`889`	`889`
`890`	`890`	`#ifdef __linux__`
`891`		`- parent_ptr = sdl_mouse_window;`
	`891`	`+ parent_ptr = parent_window;`
`892`	`892`	`#else`
`893`	`893`	`if (parent_window != nullptr)`
`894`	`894`	`{`
`@@ -1049,8 +1049,8 @@ static void ImGui_ImplSDL2_SetWindowPos(ImGuiViewport* viewport, ImVec2 pos)`
`1049`	`1049`	`#elif defined __linux__`
`1050`	`1050`	`if(vd->ChildWindow != nullptr)`
`1051`	`1051`	`{`
`1052`		`- pos_x = viewport->Pos.x - main_viewport->Pos.x;`
`1053`		`- pos_y = viewport->Pos.y - main_viewport->Pos.y;`
	`1052`	`+ pos_x = viewport->Pos.x - parent_viewport->Pos.x;`
	`1053`	`+ pos_y = viewport->Pos.y - parent_viewport->Pos.y;`
`1054`	`1054`
`1055`	`1055`	`if(vd->ChildWindow)`
`1056`	`1056`	`{`