|
@@ -380,8 +380,9 @@ void ImGui::ShowDemoWindow(bool* p_open)
|
|
if (ImGui::TreeNode("Configuration##2"))
|
|
if (ImGui::TreeNode("Configuration##2"))
|
|
{
|
|
{
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard", &io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard);
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableKeyboard", &io.ConfigFlags, ImGuiConfigFlags_NavEnableKeyboard);
|
|
|
|
+ ImGui::SameLine(); HelpMarker("Enable keyboard controls.");
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad", &io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad);
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableGamepad", &io.ConfigFlags, ImGuiConfigFlags_NavEnableGamepad);
|
|
- ImGui::SameLine(); HelpMarker("Required backend to feed in gamepad inputs in io.NavInputs[] and set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details.");
|
|
|
|
|
|
+ ImGui::SameLine(); HelpMarker("Enable gamepad controls. Require backend to set io.BackendFlags |= ImGuiBackendFlags_HasGamepad.\n\nRead instructions in imgui.cpp for details.");
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableSetMousePos", &io.ConfigFlags, ImGuiConfigFlags_NavEnableSetMousePos);
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NavEnableSetMousePos", &io.ConfigFlags, ImGuiConfigFlags_NavEnableSetMousePos);
|
|
ImGui::SameLine(); HelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos.");
|
|
ImGui::SameLine(); HelpMarker("Instruct navigation to move the mouse cursor. See comment for ImGuiConfigFlags_NavEnableSetMousePos.");
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NoMouse", &io.ConfigFlags, ImGuiConfigFlags_NoMouse);
|
|
ImGui::CheckboxFlags("io.ConfigFlags: NoMouse", &io.ConfigFlags, ImGuiConfigFlags_NoMouse);
|
|
@@ -3568,7 +3569,7 @@ static void ShowDemoWindowMisc()
|
|
char label[32];
|
|
char label[32];
|
|
sprintf(label, "Mouse cursor %d: %s", i, mouse_cursors_names[i]);
|
|
sprintf(label, "Mouse cursor %d: %s", i, mouse_cursors_names[i]);
|
|
ImGui::Bullet(); ImGui::Selectable(label, false);
|
|
ImGui::Bullet(); ImGui::Selectable(label, false);
|
|
- if (ImGui::IsItemHovered() || ImGui::IsItemFocused())
|
|
|
|
|
|
+ if (ImGui::IsItemHovered())
|
|
ImGui::SetMouseCursor(i);
|
|
ImGui::SetMouseCursor(i);
|
|
}
|
|
}
|
|
ImGui::TreePop();
|
|
ImGui::TreePop();
|