mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-11 01:25:07 +02:00
Path code cleanup, move some UI code (#21037)
* Move a bunch of path logic into Core/Util/PathUtil.cpp/h . * Move GameImageView out from SaveDataScreen * More cleanup, add a translation string
This commit is contained in:
+7
-4
@@ -519,10 +519,11 @@ GameBrowser::GameBrowser(int token, const Path &path, BrowseFlags browseFlags, b
|
||||
using namespace UI;
|
||||
path_.SetUserAgent(StringFromFormat("PPSSPP/%s", PPSSPP_GIT_VERSION));
|
||||
Path memstickRoot = GetSysDirectory(DIRECTORY_MEMSTICK_ROOT);
|
||||
aliasMatch_ = memstickRoot;
|
||||
if (memstickRoot == GetSysDirectory(DIRECTORY_PSP)) {
|
||||
path_.SetRootAlias("ms:/PSP/", memstickRoot);
|
||||
aliasDisplay_ = "ms:/PSP/";
|
||||
} else {
|
||||
path_.SetRootAlias("ms:/", memstickRoot);
|
||||
aliasDisplay_ = "ms:/";
|
||||
}
|
||||
if (System_GetPropertyBool(SYSPROP_LIMITED_FILE_BROWSING) &&
|
||||
(path.Type() == PathType::NATIVE || path.Type() == PathType::CONTENT_URI)) {
|
||||
@@ -782,13 +783,15 @@ void GameBrowser::Refresh() {
|
||||
|
||||
const bool pathOnSeparateLine = g_display.dp_xres < 1050 || portrait_;
|
||||
|
||||
std::string pathStr = GetFriendlyPath(path_.GetPath(), aliasMatch_, aliasDisplay_);
|
||||
|
||||
if (pathOnSeparateLine) {
|
||||
Add(new TextView(path_.GetFriendlyPath(), ALIGN_VCENTER | FLAG_WRAP_TEXT, true, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Margins(8, 0, 8, 0))));
|
||||
Add(new TextView(pathStr, ALIGN_VCENTER | FLAG_WRAP_TEXT, true, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, Margins(8, 0, 8, 0))));
|
||||
}
|
||||
if (browseFlags_ & BrowseFlags::NAVIGATE) {
|
||||
if (!pathOnSeparateLine) {
|
||||
topBar->Add(new Spacer(2.0f));
|
||||
topBar->Add(new TextView(path_.GetFriendlyPath(), ALIGN_VCENTER | FLAG_WRAP_TEXT, true, new LinearLayoutParams(FILL_PARENT, 64.0f, 1.0f)));
|
||||
topBar->Add(new TextView(pathStr, ALIGN_VCENTER | FLAG_WRAP_TEXT, true, new LinearLayoutParams(FILL_PARENT, 64.0f, 1.0f)));
|
||||
}
|
||||
topBar->Add(new Choice(ImageID("I_HOME"), new LayoutParams(WRAP_CONTENT, 64.0f)))->OnClick.Handle(this, &GameBrowser::OnHomeClick);
|
||||
if (System_GetPropertyBool(SYSPROP_HAS_ADDITIONAL_STORAGE)) {
|
||||
|
||||
Reference in New Issue
Block a user