Skip to content

[pull] master from hrydgard:master #572

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
pull merged 6 commits into from
May 1, 2026
Merged

[pull] master from hrydgard:master #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
34512a4
Show the entry even for hidden adhoc servers if they are currently ch…
hrydgard May 1, 2026
dbef961
Jetpack Joyride: Add to compat.ini [ReportSmallMemStick]
hrydgard May 1, 2026
f385a11
WASAPI: If audioclient3 exists but fails init, fall back to audioclient.
hrydgard May 1, 2026
53bbe11
WASAPI init bug fixes
hrydgard May 1, 2026
487801c
Don't show the keyboard when switching to imgui on mobile.
hrydgard May 1, 2026
ff2280a
Merge pull request #21623 from hrydgard/more-ui-improvements
hrydgard May 1, 2026
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
3 changes: 2 additions & 1 deletion UI/AdhocServerScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,8 @@ void AdhocServerScreen::CreatePopupContents(UI::ViewGroup *parent) {

CollapsibleSection *publicSection = innerView->Add(new CollapsibleSection(n->T("Public server list"), new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
for (const auto &entry : entries) {
if (entry.hidden)
// Show even hidden entries, as long as they are chosen currently.
if (entry.hidden && entry.host != g_Config.sProAdhocServer)
continue;
AddButtonFromEntry(publicSection, entry, false);
}
Expand Down
2 changes: 1 addition & 1 deletion UI/DeveloperToolsScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void DeveloperToolsScreen::CreateGeneralTab(UI::LinearLayout *list) {
#endif

#if PPSSPP_PLATFORM(IOS)
list->Add(new NoticeView(NoticeLevel::WARN, ms->T("Moving the memstick directory is NOT recommended on iOS"), ""));
list->Add(new NoticeView(NoticeLevel::WARN, ms->T("Moving the memstick directory is NOT recommended on iOS"), ""))->SetWrapText(true);
list->Add(new Choice(sy->T("Set Memory Stick folder")))->OnClick.Add(
[=](UI::EventParams &) {
SetMemStickDirDarwin(GetRequesterToken());
Expand Down
5 changes: 5 additions & 0 deletions UI/EmuScreen.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1851,7 +1851,12 @@ ScreenRenderFlags EmuScreen::RunEmulation(bool skipBufferEffects) {

void EmuScreen::runImDebugger() {
if (!lastImguiEnabled_ && g_Config.bShowImDebugger) {
#if !defined(MOBILE_DEVICE)
// On mobile devices (specifically iOS) we don't want to pop the keyboard
// on activating imgui. Instead, we should do it when a text edit field in imgui gets focus,
// although we'll still have ugly overlap problems.
System_NotifyUIEvent(UIEventNotification::TEXT_GOTFOCUS);
#endif
VERBOSE_LOG(Log::System, "activating keyboard");
} else if (lastImguiEnabled_ && !g_Config.bShowImDebugger) {
System_NotifyUIEvent(UIEventNotification::TEXT_LOSTFOCUS);
Expand Down
Loading
Loading