mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-10-01 14:58:14 +00:00
Merge pull request #21589 from hrydgard/assorted-ui-fixes
Fix display of HTTP links in recents list
This commit is contained in:
4 files changed
+16
-3
No files matched your search
@@ -1098,7 +1098,8 @@ VKContext::VKContext(VulkanContext *vulkan, bool useRenderThread)
|
||||
WARN_LOG(Log::G3D, "KHR_create_renderpass2 not supported, disabling multisampling");
|
||||
multisampleAllowed = false;
|
||||
} else {
|
||||
_dbg_assert_(vkCreateRenderPass2 != nullptr);
|
||||
// This is hit using a replacement adreno driver, "EggNS mesa skyport".
|
||||
// _dbg_assert_(vkCreateRenderPass2 != nullptr);
|
||||
}
|
||||
|
||||
// We limit multisampling functionality to reasonably recent and known-good tiling GPUs.
|
||||
|
||||
+12
-1
@@ -243,7 +243,18 @@ void GameButton::Draw(UIContext &dc) {
|
||||
texture = ginfo->icon.texture;
|
||||
} else if (drawBackground) {
|
||||
// No icon, but drawBackground is set. Let's show a plain icon depending on type.
|
||||
imageIcon = (ginfo->fileType == IdentifiedFileType::PSP_ISO || ginfo->fileType == IdentifiedFileType::PSP_ISO_NP) ? ImageID("I_UMD") : ImageID("I_APP");
|
||||
if (ginfo->fileType == IdentifiedFileType::PSP_ISO || ginfo->fileType == IdentifiedFileType::PSP_ISO_NP) {
|
||||
imageIcon = ImageID("I_UMD");
|
||||
} else if (gamePath_.Type() == PathType::HTTP) {
|
||||
imageIcon = ginfo->fileType == IdentifiedFileType::UNKNOWN ? ImageID("I_LINK_OUT_QUESTION") : ImageID("I_LINK_OUT");
|
||||
} else {
|
||||
imageIcon = ImageID("I_APP");
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// Make sure that pending HTTP icons show something, instead of just blank.
|
||||
if (gamePath_.Type() == PathType::HTTP) {
|
||||
imageIcon = ImageID("I_LINK_OUT_QUESTION");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
android:theme="@style/ppsspp_style"
|
||||
android:launchMode="singleInstance"
|
||||
android:exported="true">
|
||||
<property android:name="android.window.PROPERTY_COMPAT_ALLOW_RESTRICTED_RESIZABILITY" android:value="true" />
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
|
||||
@@ -268,7 +268,7 @@
|
||||
d="m -130.87109,-180.5957 -10.74805,16.79883 -5.63672,-8.21485 -2.78516,1.91211 8.51954,12.41797 13.49609,-21.0918 z"
|
||||
id="path1353" /></g><g
|
||||
id="I_SPEAKER_MAX"
|
||||
transform="matrix(0.44009307,0,0,0.44009307,-44.162753,-61.374064)"
|
||||
transform="matrix(0.44009307,0,0,0.44009307,-46.544002,-61.374064)"
|
||||
inkscape:export-xdpi="135"
|
||||
inkscape:export-ydpi="135"><g
|
||||
transform="matrix(1.1742907,0,0,1.1742907,225.4342,162.52437)"
|
||||
|
||||
|
Before Width: | Height: | Size: 155 KiB After Width: | Height: | Size: 155 KiB |
Reference in new issue
Block a user