disable bring into view while preview is on top of config

This commit is contained in:
Miuzarte
2026-06-01 00:38:23 +08:00
parent e48f61a61e
commit efde471bef
5 changed files with 8 additions and 3 deletions

View File

@@ -493,7 +493,7 @@ internal fun DeviceTabPage(
forwardKeyRepeat = sessionInfo?.forwardKeyRepeat ?: true,
)
},
autoBringIntoView = pendingScrollToPreview && !directControlEnabled,
autoBringIntoView = pendingScrollToPreview && !directControlEnabled && !asBundle.previewCardOnTop,
onAutoBringIntoViewConsumed = { viewModel.clearPendingScrollToPreview() },
onTouchActiveChanged = {
if (directControlEnabled) onPreviewGestureLockChanged(it)

View File

@@ -78,7 +78,7 @@ internal fun ScrcpyAllOptionsScreen(
ScrcpyOptions.GLOBAL_PROFILE_ID
} else {
DeviceShortcuts.unmarshalFrom(qdBundleShared.quickDevicesList)
.get(currentTarget.host, currentTarget.port)
.firstOrNull { it.matchesAddress(currentTarget) }
?.scrcpyProfileId
?: ScrcpyOptions.GLOBAL_PROFILE_ID
}

View File

@@ -434,7 +434,10 @@ fun SettingsPage(
summary = stringResource(R.string.pref_summary_preview_card_on_top),
checked = asBundle.previewCardOnTop,
onCheckedChange = {
asBundle = asBundle.copy(previewCardOnTop = it)
asBundle = asBundle.copy(
previewCardOnTop = it,
)
if (it) AppRuntime.snackbar(R.string.pref_tips_preview_card_on_top)
},
)
ArrowSlider(

View File

@@ -174,6 +174,7 @@
<string name="pref_summary_hide_simple_settings">启用后设备页仅保留更多参数、所有应用、最近任务和启动/停止按钮</string>
<string name="pref_title_preview_card_on_top">使预览卡显示在配置卡上方</string>
<string name="pref_summary_preview_card_on_top">启用后设备页预览卡和虚拟按钮将显示在 Scrcpy 配置卡的上方</string>
<string name="pref_tips_preview_card_on_top">推荐同时启用“隐藏设备页日志框”</string>
<string name="pref_title_preview_card_height">预览卡高度</string>
<string name="pref_summary_preview_card_height">设备页预览卡高度</string>
<string name="pref_title_quick_device_sort">快速设备排序</string>

View File

@@ -174,6 +174,7 @@
<string name="pref_summary_hide_simple_settings">When enabled, the device page only keeps More parameters, All apps, Recent tasks, and Start/Stop buttons</string>
<string name="pref_title_preview_card_on_top">Show preview card above config</string>
<string name="pref_summary_preview_card_on_top">When enabled, the preview card and virtual buttons appear above the Scrcpy config card on the device page</string>
<string name="pref_tips_preview_card_on_top">It is recommended to also enable \"Hide device page log box\"</string>
<string name="pref_title_preview_card_height">Preview card height</string>
<string name="pref_summary_preview_card_height">Preview card height on device page</string>
<string name="pref_title_quick_device_sort">Quick device sort</string>