diff --git a/app/src/main/cpp/waylandcomp/src/vk_present.c b/app/src/main/cpp/waylandcomp/src/vk_present.c index aa63253b67..e0e494cb87 100644 --- a/app/src/main/cpp/waylandcomp/src/vk_present.c +++ b/app/src/main/cpp/waylandcomp/src/vk_present.c @@ -416,8 +416,7 @@ static void update_map(int scene_w, int scene_h) { if (mode == VKP_MODE_FILL) aspect = sx > sy ? sx : sy; else if (mode == VKP_MODE_INTEGER) { float m = sx < sy ? sx : sy; - aspect = (float)(int)m; - if (aspect < 1.0f) aspect = 1.0f; + aspect = m >= 1.0f ? (float)(int)m : m; } else aspect = sx < sy ? sx : sy; g_map.kx = g_map.ky = aspect; g_map.off_x = (float)(g_map.rx + (int)((g_map.rw - scene_w * aspect) * 0.5f)); diff --git a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt index c79f757531..4e774e76b6 100644 --- a/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/FrontEndActivity.kt @@ -195,6 +195,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet private var showPhantomGate by mutableStateOf(false) private var directAudio by mutableStateOf(false) private var picturePosition by mutableStateOf("center") + private var integerScaling by mutableStateOf(false) private var stretch16x9 by mutableStateOf(false) private var orientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE) private var launcherOrientation by mutableStateOf(android.content.pm.ActivityInfo.SCREEN_ORIENTATION_USER) @@ -2551,6 +2552,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet backActionsInverted = backActionsInverted, directAudio = if (mode == SessionService.MODE_STEAM) directAudio else null, picturePosition = if (mode == SessionService.MODE_STEAM) picturePosition else null, + integerScaling = if (mode == SessionService.MODE_STEAM) integerScaling else null, stretch16x9 = if (mode == SessionService.MODE_STEAM) stretch16x9 else null, mic = if (mode == SessionService.MODE_STEAM) mic else null, gameStorage = if (mode == SessionService.MODE_STEAM) gameStorage else null, @@ -2612,6 +2614,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet }, onDirectAudio = { on -> SessionPrefs.setDirectAudio(this, on); directAudio = on }, onPicturePosition = { value -> SessionPrefs.setPicturePosition(this, value); picturePosition = value }, + onIntegerScaling = { on -> SessionPrefs.setIntegerScaling(this, on); integerScaling = on }, onStretch16x9 = { on -> SessionPrefs.setStretch16x9(this, on); stretch16x9 = on }, onMic = { on -> SessionPrefs.setMicEnabled(this, on) @@ -2949,6 +2952,7 @@ class FrontEndActivity : ComponentActivity(), com.droiddeck.launcher.ui.AgentPet backActionsInverted = SessionPrefs.backActionsInverted(this) directAudio = SessionPrefs.directAudio(this) picturePosition = SessionPrefs.picturePosition(this) + integerScaling = SessionPrefs.integerScaling(this) stretch16x9 = SessionPrefs.stretch16x9(this) mic = SessionPrefs.micEnabled(this) refreshWifiDiscovery() diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 8032723834..6aed0ecf48 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -173,11 +173,12 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private var adaptiveSticks by mutableStateOf(null) private var quickButtons by mutableStateOf>(emptyMap()) private var picturePosition by mutableStateOf("center") + private var integerScaling by mutableStateOf(false) private fun applyGameAlignment() { if (!CompositorHost.isStarted) return val active = SessionState.mode == SessionService.MODE_STEAM && - !pipUi && !isInPictureInPictureMode && !cardboard.enabled + !pipUi && !isInPictureInPictureMode && !activeCardboard.enabled val alignment = if (!active) ALIGN_CENTER else when (picturePosition) { "top" -> ALIGN_PICTURE_TOP "bottom" -> ALIGN_PICTURE_BOTTOM @@ -185,7 +186,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde "right" -> ALIGN_PICTURE_RIGHT else -> ALIGN_CENTER } - WaylandCompositor.nativeSetScaleMode(SCALE_FIT, alignment) + WaylandCompositor.nativeSetScaleMode(if (active && integerScaling) SCALE_INTEGER else SCALE_FIT, alignment) } private var unfoldedPanel by mutableStateOf(null) private var unfoldedColumn: android.widget.LinearLayout? = null @@ -1085,7 +1086,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde secondScreenPresentation?.closeFieldKeyboard() } } - androidx.compose.runtime.LaunchedEffect(picturePosition, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } + androidx.compose.runtime.LaunchedEffect(picturePosition, integerScaling, SessionState.running, pipUi, cardboard.enabled) { applyGameAlignment() } DroidDeckTheme { if (pipUi) { if (SessionState.suspended) androidx.compose.foundation.layout.Box( @@ -2399,6 +2400,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde unfoldedControls = SessionPrefs.unfoldedControls(this) unfoldedControlsWithController = SessionPrefs.unfoldedControlsWithController(this) picturePosition = SessionPrefs.picturePosition(this) + integerScaling = SessionPrefs.integerScaling(this) hudOn = SessionPrefs.hudEnabled(this) hudConfig = DroidDeckHudConfig.load(this) hudColor = SessionPrefs.hudColor(this) @@ -2654,7 +2656,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde runCatching { GameEnvironmentStore.publish(this) } .onFailure { Log.e(TAG, "Could not update game environment", it) } }, "game-env-publish").start() - WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + applyGameAlignment() val activeProfileId = currentScreenEffectsProfileId() val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, activeProfileId) val activeEffects = SessionPrefs.screenEffects(this, activeProfileId) @@ -4636,25 +4638,18 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde gamePictureBounds[2], gamePictureBounds[3] ) + val nativeWidth: Int + val nativeHeight: Int if (glassesOutputActive) { val mode = glassesScreen?.display?.mode ?: return null - val outputWidth = mode.physicalWidth.takeIf { it > 0 } ?: return null - val outputHeight = mode.physicalHeight.takeIf { it > 0 } ?: return null - val scaleX = width.toFloat() / outputWidth - val scaleY = height.toFloat() / outputHeight - - return android.graphics.RectF( - rect.left * scaleX, - rect.top * scaleY, - rect.right * scaleX, - rect.bottom * scaleY - ) + nativeWidth = mode.physicalWidth.takeIf { it > 0 } ?: return null + nativeHeight = mode.physicalHeight.takeIf { it > 0 } ?: return null + } else { + val nativeSize = IntArray(2) + if (!WaylandCompositor.nativeOutputSize(nativeSize)) return null + nativeWidth = nativeSize[0].takeIf { it > 0 } ?: return null + nativeHeight = nativeSize[1].takeIf { it > 0 } ?: return null } - - val nativeSize = IntArray(2) - if (!WaylandCompositor.nativeOutputSize(nativeSize)) return null - val nativeWidth = nativeSize[0].takeIf { it > 0 } ?: return null - val nativeHeight = nativeSize[1].takeIf { it > 0 } ?: return null val scaleX = width.toFloat() / nativeWidth val scaleY = height.toFloat() / nativeHeight @@ -4863,7 +4858,8 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private fun dispatchDirectTouch(event: MotionEvent): Boolean { val rect = drawnRect() ?: return false if (event.actionMasked == MotionEvent.ACTION_DOWN) - ignoreGameTouch = topPictureMapped && !rect.contains(event.x, event.y) + ignoreGameTouch = topPictureMapped && !glassesOutputActive && + !rect.contains(event.x, event.y) if (ignoreGameTouch) { if (event.actionMasked == MotionEvent.ACTION_DOWN) { directTouchHold.cancel() @@ -5389,7 +5385,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde listOf(PointerGestures.BTN_LEFT, PointerGestures.BTN_RIGHT, PointerGestures.BTN_MIDDLE).forEach { heldButtons.set(1, it, false) } - WaylandCompositor.nativeSetScaleMode(SCALE_FIT, ALIGN_CENTER) + applyGameAlignment() } } else if (!isFinishing && !isDestroyed) { window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) @@ -5750,6 +5746,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde cardboard = c val e = effectiveCardboard(c) activeCardboard = e + applyGameAlignment() if (CompositorHost.isStarted) pushCardboard(e) if (e.enabled && !was.enabled) headTracker?.recenter() updateHeadTracker() @@ -6369,6 +6366,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde private val steamVrWorker = java.util.concurrent.ThreadPoolExecutor(0, 1, 30, java.util.concurrent.TimeUnit.SECONDS, java.util.concurrent.LinkedBlockingQueue()) { Thread(it, "steamvr") } private const val SCALE_FIT = 1 + private const val SCALE_INTEGER = 4 private const val ALIGN_CENTER = 0 private const val ALIGN_PICTURE_TOP = 3 private const val ALIGN_PICTURE_BOTTOM = 4 diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt index 035c237bd0..aae250583a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionPrefs.kt @@ -641,6 +641,13 @@ object SessionPrefs { position.takeIf { it in listOf("top", "bottom", "left", "right", "center") } ?: "center").apply() } + fun integerScaling(context: Context): Boolean = + prefs(context).getBoolean("integerScaling", false) + + fun setIntegerScaling(context: Context, enabled: Boolean) { + prefs(context).edit().putBoolean("integerScaling", enabled).apply() + } + fun returnAfterGame(context: Context): Boolean = prefs(context).getBoolean("returnAfterGame", true) fun setReturnAfterGame(context: Context, on: Boolean) { diff --git a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt index cc7779322e..92ec84c13a 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SettingsReset.kt @@ -18,7 +18,7 @@ object SettingsReset { "storesInstallLanguage", "hud", "hudDeck", "hudFps", "hudBattery", "hudGraph", "hudColor", "hudOpacity", "__KEEP_droidDeckHud__", "__KEEP_droidDeckHudPos__", "backHold", "backActionsInverted", "backDoubleTapMs", "touch", "pen", "penButton", "osc", "shape", "steamController", "gamepadLeft", "gamepadRight", "pipAutoEnter", "unfoldedControls", "unfoldedControlsWithController", - "stretch16x9", "picturePosition", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", + "stretch16x9", "picturePosition", "integerScaling", "railLabels", "agentTab", "navTabOrder", "navTabShelved", "navTabHidden", "pcKeyboardSize", "pcKeyboardOpacity", "pcKeyboardHiddenKeys", "gpuDriverMode", "androidDriver", "linuxDriver", "linuxDriver.steam", "linuxDriver.desktop", "tuSysmem", "glThread", "noGlError", "zinkLazy", "mangoapp", "gpuClockPin", "gamescopeRealtime", "paceCores", "ramCapMb", "vramCapMb", "zramClient", "zramIdle", "directAudio", "mic", "wifiDiscovery", "clientCpusOverride", "clientCpus", "gameCpus", diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt index 4c882ab1e9..d25cd1ffa3 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ModeSettingsDialog.kt @@ -83,6 +83,7 @@ class ModeSettings( val forceSsbs: Boolean = false, val syncBackend: String? = null, val picturePosition: String? = null, + val integerScaling: Boolean? = null, val stretch16x9: Boolean? = null, val steamClientArch: String? = null, val returnAfterGame: Boolean? = null, @@ -139,6 +140,7 @@ class ModeSettingsActions( val onForceSsbs: (Boolean) -> Unit = {}, val onSyncBackend: (String) -> Unit = {}, val onPicturePosition: (String) -> Unit = {}, + val onIntegerScaling: (Boolean) -> Unit = {}, val onStretch16x9: (Boolean) -> Unit = {}, val onSteamRepair: () -> Unit = {}, val onSteamClientArch: (String) -> Unit = {}, @@ -242,6 +244,18 @@ fun ModeSheetRows(s: ModeSettings, a: ModeSettingsActions, tab: String, extras: } } SettingsGroup(stringResource(R.string.display_image_scaling)) { + s.integerScaling?.let { enabled -> + ChoiceRow( + host, "integer-scaling", + stringResource(R.string.display_integer_scaling), + stringResource(R.string.display_integer_scaling_hint), + listOf( + false to stringResource(R.string.display_scaling_fit), + true to stringResource(R.string.display_scaling_auto), + ), + enabled, onPick = a.onIntegerScaling, + ) + } ChoiceRow( host, "upscaler", stringResource(R.string.display_filter), null, SessionPrefs.upscalerChoices(LocalContext.current), s.upscaler, diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 26f1db7bb4..095fb1995e 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -4266,4 +4266,7 @@ المعروض %1$d من %2$d اضغط زر الرجوع مرة أخرى للخروج + + تحجيم صحيح بالأعداد الصحيحة + يستخدم أكبر معامل تحجيم صحيح يناسب الشاشة. إذا كان المصدر كبيرًا جدًا، يتم تصغير الصورة كاملة لتجنب الاقتصاص. يتم ضبط الدقة بشكل منفصل. diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 006974f736..2e050014fd 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -4117,4 +4117,7 @@ Mostrados %1$d de %2$d Presiona atrás una vez más para salir + + Escalado de píxeles enteros + Usa el mayor factor de escala entero que quepa. Si la imagen de origen es demasiado grande, ajusta la imagen completa para evitar recortes. La resolución se configura por separado. diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8f877c02d1..82393e0483 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -4106,4 +4106,7 @@ Показани %1$d от %2$d Натиснете отново „Назад“, за да излезете + + Целочислено мащабиране + Използва най-големия цял коефициент на мащабиране, който се побира. Ако източникът е твърде голям, побира цялото изображение, за да избегне изрязване. Разделителната способност се настройва отделно. diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6c66acabfd..be4c2e1b25 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -4186,4 +4186,7 @@ Zobrazeno %1$d z %2$d Stiskněte znovu zpět pro ukončení + + Celočíselné škálování + Použije největší celočíselný násobek měřítka, který se vejde. Pokud je zdroj příliš velký, přizpůsobí celý obraz, aby nedošlo k oříznutí. Rozlišení se nastavuje samostatně. diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d2f31b011e..5dce74fc53 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -4106,4 +4106,7 @@ Vist %1$d af %2$d Tryk tilbage igen for at afslutte + + Heltalsskalering + Bruger den største hele skaleringsfaktor, der kan være der. Hvis kilden er for stor, tilpasses hele billedet for at undgå beskæring. Opløsningen indstilles separat. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 47dce20b4a..10bb9f7c16 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -4106,4 +4106,7 @@ Angezeigt %1$d von %2$d Noch einmal zurück drücken zum Beenden + + Ganzzahlige Skalierung + Verwendet den größten ganzzahligen Skalierungsfaktor, der passt. Ist die Quelle zu groß, wird das gesamte Bild eingepasst, um Beschneidung zu vermeiden. Die Auflösung wird separat eingestellt. diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 5870bfa94c..037a7da150 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -4106,4 +4106,7 @@ Εμφανίζονται %1$d από %2$d Πατήστε ξανά πίσω για έξοδο + + Ακέραια κλιμάκωση + Χρησιμοποιεί τον μεγαλύτερο ακέραιο συντελεστή κλιμάκωσης που χωράει. Αν η πηγή είναι πολύ μεγάλη, προσαρμόζει ολόκληρη την εικόνα ώστε να αποφευχθεί η περικοπή. Η ανάλυση ρυθμίζεται ξεχωριστά. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 454585bcbb..73f08e89a4 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -4146,4 +4146,7 @@ Mostrados %1$d de %2$d Pulsa atrás una vez más para salir + + Escalado de píxeles enteros + Usa el mayor factor de escala entero que quepa. Si la imagen de origen es demasiado grande, ajusta la imagen completa para evitar recortes. La resolución se configura por separado. diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 3faed1bd20..a27e6228bc 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -4106,4 +4106,7 @@ Näkyvissä %1$d / %2$d Paina takaisin vielä kerran poistuaksesi + + Kokonaislukuskaalaus + Käyttää suurinta mahtuvaa kokonaislukukerrointa. Jos lähdekuva on liian suuri, koko kuva sovitetaan rajauksen välttämiseksi. Tarkkuus määritetään erikseen. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index dca037ff9b..80765a1c86 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -4145,4 +4145,7 @@ Affichés %1$d sur %2$d Appuyez à nouveau sur retour pour quitter + + Mise à l’échelle entière + Utilise le plus grand facteur d’échelle entier possible. Si la source est trop grande, l’image entière est ajustée pour éviter le recadrage. La résolution se règle séparément. diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 9acd2d7783..3acc513034 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -4106,4 +4106,7 @@ दिखाए गए %2$d में से %1$d बाहर निकलने के लिए फिर से बैक दबाएँ + + पूर्णांक स्केलिंग + फिट होने वाले सबसे बड़े पूर्णांक स्केल का उपयोग करता है। स्रोत बहुत बड़ा होने पर काटने से बचाने के लिए पूरी छवि को फिट करता है। रिज़ॉल्यूशन अलग से सेट किया जाता है। diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index bf6abc003c..cc87c4de8e 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -4106,4 +4106,7 @@ Megjelenítve %1$d / %2$d Nyomd meg még egyszer a visszát a kilépéshez + + Egész számú méretezés + A legnagyobb elférő egész számú méretezési tényezőt használja. Ha a forrás túl nagy, a teljes képet hozzáigazítja a levágás elkerüléséhez. A felbontás külön állítható. diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index bfefdf12c7..5ebb1a34f9 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -4076,4 +4076,7 @@ Ditampilkan %1$d dari %2$d Tekan kembali sekali lagi untuk keluar + + Penskalaan bilangan bulat + Menggunakan faktor skala bilangan bulat terbesar yang muat. Jika sumber terlalu besar, seluruh gambar disesuaikan agar tidak terpotong. Resolusi diatur secara terpisah. diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 51a2ae045e..e7817522bd 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -4145,4 +4145,7 @@ Mostrati %1$d di %2$d Premi di nuovo indietro per uscire + + Ridimensionamento intero + Usa il più grande fattore di scala intero che entra nello schermo. Se la sorgente è troppo grande, adatta l’intera immagine per evitare ritagli. La risoluzione si configura separatamente. diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ace99b72c0..c2a67cc84d 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -4076,4 +4076,7 @@ 表示中 %2$d 中 %1$d もう一度戻るを押すと終了します + + 整数スケーリング + 収まる最大の整数倍率を使用します。元の画像が大きすぎる場合は、切り抜きを避けるため画像全体を収めます。解像度は別途設定します。 diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 11fbb0f3ec..dd65900c76 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -4076,4 +4076,7 @@ 표시됨 %2$d 중 %1$d 한 번 더 뒤로를 누르면 종료됩니다 + + 정수 배율 조정 + 화면에 맞는 가장 큰 정수 배율을 사용합니다. 원본이 너무 크면 잘림을 방지하기 위해 전체 이미지를 맞춥니다. 해상도는 별도로 설정합니다. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index b781198eb9..9701ed1542 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -4076,4 +4076,7 @@ Dipaparkan %1$d daripada %2$d Tekan kembali sekali lagi untuk keluar + + Penskalaan integer + Menggunakan faktor skala integer terbesar yang muat. Jika sumber terlalu besar, keseluruhan imej disesuaikan untuk mengelakkan pemotongan. Resolusi ditetapkan secara berasingan. diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index ff8ee92cac..19c503f02d 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -4106,4 +4106,7 @@ Vist %1$d av %2$d Trykk tilbake én gang til for å avslutte + + Heltallsskalering + Bruker den største hele skaleringsfaktoren som får plass. Hvis kilden er for stor, tilpasses hele bildet for å unngå beskjæring. Oppløsningen stilles inn separat. diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index e95fd9a735..4bb4d3223b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -4106,4 +4106,7 @@ Getoond %1$d van %2$d Druk nog één keer op terug om af te sluiten + + Gehele-getallenschaal + Gebruikt de grootste gehele schaalfactor die past. Als de bron te groot is, wordt de volledige afbeelding passend gemaakt om bijsnijden te voorkomen. De resolutie wordt apart ingesteld. diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b5537449ab..f8620690ac 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -4186,4 +4186,7 @@ Pokazane %1$d z %2$d Naciśnij wstecz jeszcze raz, aby wyjść + + Skalowanie całkowite + Używa największego całkowitego współczynnika skalowania, który się mieści. Jeśli źródło jest zbyt duże, dopasowuje cały obraz, aby uniknąć przycinania. Rozdzielczość ustawia się osobno. diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index b07045dcbd..09831c53f2 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -4145,4 +4145,7 @@ Mostrados %1$d de %2$d Prima novamente o botão Voltar para sair + + Escala por números inteiros + Utiliza o maior fator de escala inteiro que couber. Se a imagem de origem for demasiado grande, ajusta a imagem completa para evitar cortes. A resolução é configurada separadamente. diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 988e258cbe..42248a4fb5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -4153,4 +4153,7 @@ Exibidos %1$d de %2$d Pressione o botão Voltar novamente para sair + + Escala por números inteiros + Usa o maior fator de escala inteiro que couber. Se a imagem de origem for grande demais, ajusta a imagem completa para evitar cortes. A resolução é configurada separadamente. diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 032e628dde..c00b97f0e9 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -4146,4 +4146,7 @@ Afișate %1$d din %2$d Apasă din nou înapoi pentru a ieși + + Scalare cu numere întregi + Folosește cel mai mare factor întreg de scalare care încape. Dacă sursa este prea mare, adaptează întreaga imagine pentru a evita decuparea. Rezoluția se configurează separat. diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 476efea4e9..f373bcf903 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4186,4 +4186,7 @@ Показано %1$d из %2$d Нажмите «Назад» ещё раз, чтобы выйти + + Целочисленное масштабирование + Использует наибольший целочисленный коэффициент масштабирования, который помещается. Если исходное изображение слишком велико, оно уменьшается целиком, чтобы избежать обрезки. Разрешение настраивается отдельно. diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 0c9addcde5..bdfb11dd91 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -4106,4 +4106,7 @@ Visade %1$d av %2$d Tryck tillbaka igen för att avsluta + + Heltalsskalning + Använder den största hela skalningsfaktorn som får plats. Om källbilden är för stor anpassas hela bilden för att undvika beskärning. Upplösningen ställs in separat. diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 9c936f699b..2a74e0f185 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -4076,4 +4076,7 @@ ที่แสดง %1$d จาก %2$d กดกลับอีกครั้งเพื่อออก + + การปรับขนาดจำนวนเต็ม + ใช้ตัวคูณการปรับขนาดจำนวนเต็มที่ใหญ่ที่สุดที่พอดี หากภาพต้นฉบับใหญ่เกินไป จะปรับภาพทั้งหมดให้พอดีเพื่อหลีกเลี่ยงการตัดภาพ โดยตั้งค่าความละเอียดแยกต่างหาก diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1ba6ea683d..8a72d0a584 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -4106,4 +4106,7 @@ Gösterilen %1$d / %2$d Çıkmak için bir kez daha geri basın + + Tam sayı ölçeklendirme + Sığan en büyük tam sayı ölçekleme katsayısını kullanır. Kaynak çok büyükse kırpmayı önlemek için görüntünün tamamını sığdırır. Çözünürlük ayrı ayarlanır. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 699d176341..a09c1234f6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -4186,4 +4186,7 @@ Показано %1$d з %2$d Натисніть «Назад» ще раз, щоб вийти + + Цілочисельне масштабування + Використовує найбільший цілий коефіцієнт масштабування, який поміщається. Якщо вихідне зображення завелике, воно вміщується повністю без обрізання. Роздільна здатність налаштовується окремо. diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 284e5c94a1..e0ae6e7e6e 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -4076,4 +4076,7 @@ Đang hiển thị %1$d trên %2$d Nhấn lại để thoát + + Tỷ lệ nguyên + Sử dụng hệ số tỷ lệ nguyên lớn nhất có thể vừa màn hình. Nếu nguồn quá lớn, toàn bộ hình ảnh sẽ được thu vừa để tránh bị cắt. Độ phân giải được thiết lập riêng. diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index e2f20e1e19..d95be01abc 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4076,4 +4076,7 @@ 已显示 %1$d / %2$d 再按一次返回键退出 + + 整数缩放 + 使用能够容纳的最大整数缩放倍数。如果源图像过大,则缩放整张图像以避免裁切。分辨率单独设置。 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 978f3efc83..50d5590f72 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -4076,4 +4076,7 @@ 已顯示 %1$d / %2$d 再按一次返回鍵退出 + + 整數縮放 + 使用可容納的最大整數縮放倍數。如果來源圖像太大,便縮放整張圖像以避免裁切。解像度會另外設定。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 8c733aa7d8..431ff323a0 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -4076,4 +4076,7 @@ 已顯示 %1$d / %2$d 再按一次返回鍵退出 + + 整數縮放 + 使用可容納的最大整數縮放倍數。如果來源影像太大,會縮放整張影像以避免裁切。解析度會另外設定。 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e1df2af429..36bf2d60de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -2659,6 +2659,10 @@ Keep proportions Stretch to display Image scaling + Integer scaling + Uses the largest whole-number scale that fits. If the source is too large, fits the full image to avoid cropping. Resolution is configured separately. + Fit + Auto Scaling filter Shared by Steam and Desktop. Applies live. Shared by Steam and Desktop.