Skip to content

Fix text entry focus issues across lobby UI #402

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

Open
MrS-ibra wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix text entry focus issues across lobby UI #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ void PopupHostGameInit( WindowLayout *layout, void *userData )
GadgetCheckBoxSetChecked( checkBoxLimitArmies, usingStats? FALSE : customPref.getFactionsLimited() );
#endif

TheWindowManager->winSetFocus( parentPopup );
TheWindowManager->winSetFocus(textEntryGameName);
TheWindowManager->winSetModal( parentPopup );

#if defined(GENERALS_ONLINE)
Expand Down
2 changes: 1 addition & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupJoinGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void PopupJoinGameInit( WindowLayout *layout, void *userData )
UnicodeString lobbyName(from_utf8(lobbyTryingToJoin.name).c_str());
GadgetStaticTextSetText(staticTextGameName, lobbyName);

TheWindowManager->winSetFocus( parentPopup );
TheWindowManager->winSetFocus(textEntryGamePassword);
TheWindowManager->winSetModal( parentPopup );

}
Expand Down
1 change: 1 addition & 0 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLBuddyOverlay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1318,6 +1318,7 @@ WindowMsgHandledType WOLBuddyOverlaySystem( GameWindow *window, UnsignedInt msg,
pSocialInterface->ClearUnreadChatMessagesForUser(profileID);
updateBuddyInfo(true, true); // use cache
}
TheWindowManager->winSetFocus(buddyControls.textEntryEdit);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1331,6 +1331,7 @@ void WOLDisplaySlotList( void )
comboBoxPlayerTemplate, comboBoxTeam, buttonAccept, buttonStart, buttonMapStartPosition );

WOLDisplayGameOptions();
TheWindowManager->winSetFocus(textEntryChat);

for (Int i=0; i<MAX_SLOTS; ++i)
{
Expand Down Expand Up @@ -2085,9 +2086,9 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
enterTime = timeGetTime();

// Set Keyboard to chat entry
TheWindowManager->winSetFocus( textEntryChat );
raiseMessageBoxes = true;
TheTransitionHandler->setGroup("GameSpyGameOptionsMenuFade");
TheWindowManager->winSetFocus(textEntryChat);

#if defined(GENERALS_ONLINE)
// NGMP: Did we just enter a lobby with modified camera height?
Expand Down
3 changes: 1 addition & 2 deletions GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLLobbyMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1392,8 +1392,6 @@ void WOLLobbyMenuInit( WindowLayout *layout, void *userData )
}
*/

// Set Keyboard to chat window
TheWindowManager->winSetFocus( textEntryChat );
raiseMessageBoxes = true;

TheLobbyQueuedUTMs.clear();
Expand Down Expand Up @@ -1742,6 +1740,7 @@ void WOLLobbyMenuUpdate( WindowLayout * layout, void *userData)
{
TheTransitionHandler->remove("MainMenuDefaultMenuLogoFade");
TheTransitionHandler->setGroup("WOLCustomLobbyFade");
TheWindowManager->winSetFocus(textEntryChat);
initialGadgetDelay = 2;
justEntered = FALSE;
}
Expand Down
Loading