diff --git a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt index 2acb19007..58d8599f5 100644 --- a/app/src/main/java/com/droiddeck/launcher/MainActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/MainActivity.kt @@ -1600,7 +1600,10 @@ class MainActivity : ComponentActivity() { val scanGeneration = ++libraryScanGeneration if (shortcutPicker) shortcutLibraryScanning = true Thread({ - // Steam's own games first, from their manifests alone (quick), beside the added games + // The emulators first: they need no walk of the games, and Desktop's dock is made of them. + val emus = Library.emulators(this) { id -> DesktopCatalog.installed(this, id) != null } + ui.post { if (scanGeneration == libraryScanGeneration) emulatorList = emus } + // Steam's own games next, from their manifests alone (quick), beside the added games // already listed: a game Steam installed during the session shows as the session ends, // without waiting for the added games' walk below. Its Windows components' list is // queued then too, on the low-priority worker, so its page is usually ready. @@ -1621,7 +1624,6 @@ class MainActivity : ComponentActivity() { // so a partial list first would shuffle every capsule when the rest arrived. // LibraryCache covers the wait. val games = if (ready) Library.launchableGames(this) else emptyList() - val emus = Library.emulators(this) { id -> DesktopCatalog.installed(this, id) != null } val all = games.distinctBy { it.gameId } if (ready) com.droiddeck.launcher.frontend.LibraryCache.save(this, all) // Once per app start: the Steam games' Windows components from Steam's lists. @@ -1636,7 +1638,6 @@ class MainActivity : ComponentActivity() { ui.post { if (scanGeneration == libraryScanGeneration) { steamGames = all - emulatorList = emus shortcutLibraryScanning = false handleGameLink(all) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt index 9c74f997b..9d52bdf50 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DesktopPage.kt @@ -142,14 +142,11 @@ internal fun DesktopPage(s: FrontEndState, a: FrontEndActions, modifier: Modifie }, words = { Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { - Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(12.dp)) { - // The word at the wordmark's size. - Text( - stringResource(R.string.rail_desktop), fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, - fontWeight = FontWeight.Black, color = colors.onBackground, - ) - Chip(stringResource(R.string.desktop_shell_kde), ok = true) - } + // The word at the wordmark's size. + Text( + stringResource(R.string.rail_desktop), fontSize = if (narrow) 30.sp else 42.sp, lineHeight = if (narrow) 34.sp else 46.sp, + fontWeight = FontWeight.Black, color = colors.onBackground, + ) BusyChip(s) } }, diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ee9ea4ea0..da7fd4c65 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2223,7 +2223,6 @@ Its settings and files are kept. Keep - KDE Plasma Nothing yet. Get an emulator or add an app below. Get more Size on disk