preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-13 09:39:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

MemStickScreen: Show the move's progress, and the free space after views are recreated

Browse Source 
The spacer column was FILL_PARENT high, which in the new row of columns
took the whole screen and pushed the progress below off it. The free
space was set on a view that RecreateViews() then replaced with a new
one saying "...", so it's kept and used when creating the views.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Henrik RydgårdandClaude Opus 5.5 committed 2026-11-06 14:53:37 +01:00
1 parent 1c0d8a2b96
commit dbca4f8069
2 files changed
+9 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

UI/MemStickScreen.cpp
+7 -3
View File
@@ -534,7 +534,8 @@ void ConfirmMemstickMoveScreen::CreateViews() {
const Path &oldMemstickFolder = g_Config.memStickDirectory;
Spacer *spacerColumn = new Spacer(new LinearLayoutParams(20.0, FILL_PARENT, 0.0f));
// Not FILL_PARENT high: in the row, that would push the progress below off the screen.
Spacer *spacerColumn = new Spacer(new LinearLayoutParams(20.0f, WRAP_CONTENT, 0.0f));
ViewGroup *leftColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0));
ViewGroup *rightColumn = new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0));
columns->Add(spacerColumn);
@@ -548,7 +549,9 @@ void ConfirmMemstickMoveScreen::CreateViews() {
leftColumn->Add(new TextView(GetMemstickFolderDisplayName(newMemstickFolder_), ALIGN_LEFT | FLAG_WRAP_TEXT, false));
// TODO: Add spinner
newFreeSpaceView_ = leftColumn->Add(new TextView(ApplySafeSubstitutions("%1: ...", ms->T("Free space")), ALIGN_LEFT, false));
// Views get recreated after the free space has come in, so the text can't just be set when it does.
const std::string freeSpace = freeSpace_ == FREE_SPACE_PENDING ? std::string("...") : FormatSpaceString(freeSpace_);
newFreeSpaceView_ = leftColumn->Add(new TextView(std::string(ms->T("Free space")) + ": " + freeSpace, ALIGN_LEFT, false));
if (existingFilesInNewFolder_) {
leftColumn->Add(new NoticeView(NoticeLevel::SUCCESS, ms->T("Already contains PSP data"), ""));
@@ -685,7 +688,8 @@ void ConfirmMemstickMoveScreen::update() {
if (newSpaceTask_ && newFreeSpaceView_) {
SpaceResult *result = newSpaceTask_->Poll();
if (result) {
newFreeSpaceView_->SetText(std::string(ms->T("Free space")) + ": " + FormatSpaceString(result->bytesFree));
freeSpace_ = result->bytesFree;
newFreeSpaceView_->SetText(std::string(ms->T("Free space")) + ": " + FormatSpaceString(freeSpace_));
delete newSpaceTask_;
newSpaceTask_ = nullptr;
}
UI/MemStickScreen.h
+2
View File
@@ -131,6 +131,8 @@ private:
bool dataMoved_ = false;
// Set when everything worked: restart then (time_now_d()), after showing that.
double restartTime_ = 0.0;
static constexpr int64_t FREE_SPACE_PENDING = -2;
int64_t freeSpace_ = FREE_SPACE_PENDING;
MoveProgressReporter progressReporter_;
UI::TextView *progressView_ = nullptr;