Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changed input disable to only be forced on switch #941

Merged
merged 10 commits into from
Aug 8, 2022
Merged

Changed input disable to only be forced on switch #941

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
330b482
Changed input disable to only be forced on switch
KiritoDv Jul 26, 2022
27df62d
Inverted if
KiritoDv Jul 26, 2022
b56f116
Finally fixed validation
KiritoDv Jul 26, 2022
3085245
Removed enhancement if its a switch build
KiritoDv Jul 26, 2022
704f6b2
Input now only gets blocked when the device is not a keyboard or its …
KiritoDv Aug 3, 2022
d47176b
Input gets blocked when the controller view is opened
KiritoDv Aug 3, 2022
2dce7e7
gControlNav is enabled by default on switch
KiritoDv Aug 3, 2022
19d0984
Fixed conflicts
KiritoDv Aug 3, 2022
7d38b95
Fixed conflicts again
KiritoDv Aug 6, 2022
0ec2e03
Fixed compilation issues
KiritoDv Aug 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions libultraship/libultraship/ImGuiImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,9 +858,11 @@ namespace SohImGui {

if (ImGui::BeginMenu("Controller"))
{

#ifndef __SWITCH__
KiritoDv marked this conversation as resolved.
Show resolved Hide resolved
EnhancementCheckbox("Use Controller Navigation", "gControlNav");
Tooltip("Allows controller navigation of the menu bar\nD-pad to move between items, A to select, and X to grab focus on the menu bar");

#endif
EnhancementCheckbox("Controller Configuration", "gControllerConfigurationEnabled");
controller->Opened = CVar_GetS32("gControllerConfigurationEnabled", 0);

Expand Down Expand Up @@ -1303,7 +1305,7 @@ namespace SohImGui {
{
val = 20;
}

CVar_SetS32(fps_cvar, val);
needs_save = true;
}
Expand Down
6 changes: 5 additions & 1 deletion libultraship/libultraship/Window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ extern "C" {
pad->gyro_x = 0;
pad->gyro_y = 0;

if (!CVar_GetS32("gOpenMenuBar", 0)) {
#ifdef __SWITCH__
if(!CVar_GetS32("gOpenMenuBar", 0)) {
#else
if(!(CVar_GetS32("gControlNav", 0) && CVar_GetS32("gOpenMenuBar", 0))) {
KiritoDv marked this conversation as resolved.
Show resolved Hide resolved
KiritoDv marked this conversation as resolved.
Show resolved Hide resolved
#endif
Ship::Window::ControllerApi->WriteToPad(pad);
}

Expand Down