Skip to content

Fix guiSetInputMode cursor bug (#4015) #4439

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

Merged
merged 2 commits into from
Sep 13, 2025
Merged

Fix guiSetInputMode cursor bug (#4015) #4439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee6fb57
Enhance GUI input handling
MohabCodeX Sep 9, 2025
0c6e9e6
Merge branch 'master' into fix/gui-input-mode-cursor
MohabCodeX Sep 9, 2025
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
18 changes: 15 additions & 3 deletions Client/core/CGUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,21 @@ bool CLocalGUI::InputGoesToGUI()
if (!pGUI)
return false;

// Here we're supposed to check if things like menues are up, console is up or the chatbox is expecting input
// If the console is visible OR the chat is expecting input OR the mainmenu is visible
return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || pGUI->GetGUIInputEnabled() ||
bool shouldShowCursorForGUI = false;
if (pGUI->GetGUIInputEnabled())
{
eInputMode inputMode = pGUI->GetGUIInputMode();
if (inputMode == INPUTMODE_NO_BINDS_ON_EDIT)
{
shouldShowCursorForGUI = true;
}
else if (inputMode == INPUTMODE_NO_BINDS)
{
shouldShowCursorForGUI = false;
}
}

return (IsConsoleVisible() || IsMainMenuVisible() || IsChatBoxInputEnabled() || m_bForceCursorVisible || shouldShowCursorForGUI ||
!CCore::GetSingleton().IsFocused() || IsWebRequestGUIVisible());
}

Expand Down