MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Uncomment thing

merge-requests/28/head
Nemirtingas 2019-10-15 14:54:06 +02:00
parent cf3dea2bbe
commit 121df0ef39
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ImGui/impls/linux/imgui_impl_x11.cpp
View File

@ -151,12 +151,12 @@ static void ImGui_ImplX11_UpdateMousePos()
ImGuiIO& io = ImGui::GetIO(); ImGuiIO& io = ImGui::GetIO();
// Set OS mouse position if requested (rarely used, only when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user) // Set OS mouse position if requested (rarely used, only when ImGuiConfigFlags_NavEnableSetMousePos is enabled by user)
//if (io.WantSetMousePos) if (io.WantSetMousePos)
//{ {
// POINT pos = { (int)io.MousePos.x, (int)io.MousePos.y }; // POINT pos = { (int)io.MousePos.x, (int)io.MousePos.y };
// ::ClientToScreen(g_hWnd, &pos); // ::ClientToScreen(g_hWnd, &pos);
// ::SetCursorPos(pos.x, pos.y); // ::SetCursorPos(pos.x, pos.y);
//} }
// Set mouse position // Set mouse position
Window unused_window; Window unused_window;
@ -165,8 +165,7 @@ static void ImGui_ImplX11_UpdateMousePos()
XQueryPointer(g_Display, g_Window, &unused_window, &unused_window, &rx, &ry, &x, &y, &mask); XQueryPointer(g_Display, g_Window, &unused_window, &unused_window, &rx, &ry, &x, &y, &mask);
io.MousePos.x = x; io.MousePos = ImVec2((float)x, (float)y);
io.MousePos.y = y;
} }
// Gamepad navigation mapping // Gamepad navigation mapping