xenia-project/xenia
1
0
Fork 0
mirror of https://github.com/xenia-project/xenia.git synced 2025-12-06 07:12:03 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

[XAM/UI] Cast gamercard ImGUI string size to int

Browse source
This commit is contained in:
Adrian 2025-06-22 18:04:39 +01:00 committed by Radosław Gliński
parent f6323beb20
commit c5d6db2840
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/xenia/kernel/xam/ui/gamercard_ui.cc
View file

@ -394,20 +394,21 @@ void GamercardUI::DrawBaseSettings(ImGuiIO& io) {
ImGui::Text("Gamer Name:"); ImGui::Text("Gamer Name:");
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::InputText("###GamerName", gamercardValues_.gamer_name, ImGui::InputText("###GamerName", gamercardValues_.gamer_name,
std::size(gamercardValues_.gamer_name), static_cast<int>(std::size(gamercardValues_.gamer_name)),
ImGuiInputTextFlags_ReadOnly); ImGuiInputTextFlags_ReadOnly);
ImGui::Text("Gamer Motto:"); ImGui::Text("Gamer Motto:");
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::InputText("###GamerMotto", gamercardValues_.gamer_motto, ImGui::InputText("###GamerMotto", gamercardValues_.gamer_motto,
std::size(gamercardValues_.gamer_motto), static_cast<int>(std::size(gamercardValues_.gamer_motto)),
ImGuiInputTextFlags_ReadOnly); ImGuiInputTextFlags_ReadOnly);
ImGui::Text("Gamer Bio:"); ImGui::Text("Gamer Bio:");
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::InputTextMultiline("###GamerBio", gamercardValues_.gamer_bio, ImGui::InputTextMultiline(
std::size(gamercardValues_.gamer_bio), ImVec2(), "###GamerBio", gamercardValues_.gamer_bio,
ImGuiInputTextFlags_ReadOnly); static_cast<int>(std::size(gamercardValues_.gamer_bio)), ImVec2(),
ImGuiInputTextFlags_ReadOnly);
ImGui::EndDisabled(); ImGui::EndDisabled();
@ -415,12 +416,12 @@ void GamercardUI::DrawBaseSettings(ImGuiIO& io) {
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::Combo("###Language", ImGui::Combo("###Language",
reinterpret_cast<int*>(&gamercardValues_.language), reinterpret_cast<int*>(&gamercardValues_.language),
XLanguageName, std::size(XLanguageName)); XLanguageName, static_cast<int>(std::size(XLanguageName)));
ImGui::Text("Country:"); ImGui::Text("Country:");
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::Combo("###Country", reinterpret_cast<int*>(&gamercardValues_.country), ImGui::Combo("###Country", reinterpret_cast<int*>(&gamercardValues_.country),
XOnlineCountry, std::size(XOnlineCountry)); XOnlineCountry, static_cast<int>(std::size(XOnlineCountry)));
} }
void GamercardUI::DrawOnlineSettings(ImGuiIO& io) { void GamercardUI::DrawOnlineSettings(ImGuiIO& io) {
@ -443,16 +444,16 @@ void GamercardUI::DrawOnlineSettings(ImGuiIO& io) {
ImGuiInputTextFlags_ReadOnly); ImGuiInputTextFlags_ReadOnly);
ImGui::BeginDisabled(!gamercardValues_.is_live_enabled); ImGui::BeginDisabled(!gamercardValues_.is_live_enabled);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMERCARD_ZONE, "Gamer Zone", DrawSettingComboBox(
XGamerzoneName, std::size(XGamerzoneName), UserSettingId::XPROFILE_GAMERCARD_ZONE, "Gamer Zone", XGamerzoneName,
leftSideTextObjectAlignment); static_cast<int>(std::size(XGamerzoneName)), leftSideTextObjectAlignment);
ImGui::Text("Subscription Tier:"); ImGui::Text("Subscription Tier:");
ImGui::SameLine(leftSideTextObjectAlignment); ImGui::SameLine(leftSideTextObjectAlignment);
ImGui::Combo( ImGui::Combo(
"###Subscription", "###Subscription",
reinterpret_cast<int*>(&gamercardValues_.account_subscription_tier), reinterpret_cast<int*>(&gamercardValues_.account_subscription_tier),
AccountSubscription, std::size(AccountSubscription)); AccountSubscription, static_cast<int>(std::size(AccountSubscription)));
ImGui::EndDisabled(); ImGui::EndDisabled();
} }
@ -461,70 +462,72 @@ void GamercardUI::DrawGpdSettings(ImGuiIO& io) {
ImGui::SeparatorText("Game Settings"); ImGui::SeparatorText("Game Settings");
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_DIFFICULTY, "Difficulty", DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_DIFFICULTY, "Difficulty",
GamerDifficultyOptions, std::size(GamerDifficultyOptions), GamerDifficultyOptions,
static_cast<int>(std::size(GamerDifficultyOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_OPTION_CONTROLLER_VIBRATION, DrawSettingComboBox(UserSettingId::XPROFILE_OPTION_CONTROLLER_VIBRATION,
"Controller Vibration", ControllerVibrationOptions, "Controller Vibration", ControllerVibrationOptions,
std::size(ControllerVibrationOptions), static_cast<int>(std::size(ControllerVibrationOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_CONTROL_SENSITIVITY, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_CONTROL_SENSITIVITY,
"Control Sensitivity", ControlSensitivityOptions, "Control Sensitivity", ControlSensitivityOptions,
std::size(ControlSensitivityOptions), static_cast<int>(std::size(ControlSensitivityOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_PREFERRED_COLOR_FIRST, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_PREFERRED_COLOR_FIRST,
"Favorite Color (First)", PreferredColorOptions, "Favorite Color (First)", PreferredColorOptions,
std::size(PreferredColorOptions), static_cast<int>(std::size(PreferredColorOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_PREFERRED_COLOR_SECOND, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_PREFERRED_COLOR_SECOND,
"Favorite Color (Second)", PreferredColorOptions, "Favorite Color (Second)", PreferredColorOptions,
std::size(PreferredColorOptions), static_cast<int>(std::size(PreferredColorOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
ImGui::SeparatorText("Action Games Settings"); ImGui::SeparatorText("Action Games Settings");
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_YAXIS_INVERSION, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_YAXIS_INVERSION,
"Y-axis Inversion", YAxisInversionOptions, "Y-axis Inversion", YAxisInversionOptions,
std::size(YAxisInversionOptions), static_cast<int>(std::size(YAxisInversionOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_AUTO_AIM, "Auto Aim", DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_AUTO_AIM, "Auto Aim",
AutoAimOptions, std::size(AutoAimOptions), AutoAimOptions,
static_cast<int>(std::size(AutoAimOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_AUTO_CENTER, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_AUTO_CENTER,
"Auto Center", AutoCenterOptions, "Auto Center", AutoCenterOptions,
std::size(AutoCenterOptions), static_cast<int>(std::size(AutoCenterOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_MOVEMENT_CONTROL, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_ACTION_MOVEMENT_CONTROL,
"Movement Control", MovementControlOptions, "Movement Control", MovementControlOptions,
std::size(MovementControlOptions), static_cast<int>(std::size(MovementControlOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
ImGui::SeparatorText("Racing Games Settings"); ImGui::SeparatorText("Racing Games Settings");
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_TRANSMISSION, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_TRANSMISSION,
"Transmission", TransmissionOptions, "Transmission", TransmissionOptions,
std::size(TransmissionOptions), static_cast<int>(std::size(TransmissionOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_CAMERA_LOCATION, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_CAMERA_LOCATION,
"Camera Location", CameraLocationOptions, "Camera Location", CameraLocationOptions,
std::size(CameraLocationOptions), static_cast<int>(std::size(CameraLocationOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_BRAKE_CONTROL, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_BRAKE_CONTROL,
"Brake Control", BrakeControlOptions, "Brake Control", BrakeControlOptions,
std::size(BrakeControlOptions), static_cast<int>(std::size(BrakeControlOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_ACCELERATOR_CONTROL, DrawSettingComboBox(UserSettingId::XPROFILE_GAMER_RACE_ACCELERATOR_CONTROL,
"Accelerator Control", AcceleratorControlOptions, "Accelerator Control", AcceleratorControlOptions,
std::size(AcceleratorControlOptions), static_cast<int>(std::size(AcceleratorControlOptions)),
rightSideTextObjectAlignment); rightSideTextObjectAlignment);
} }