From 0f235da0edf9109426e327415d06c90c46d59d32 Mon Sep 17 00:00:00 2001 From: Hermes Agent Date: Tue, 25 Aug 2026 02:43:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D1=81=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=E2=80=94=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE:=20=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D0=B8=D1=81=D1=82=D0=B5=D0=BD=D1=82/=D0=BA=D0=BE=D0=BD=D0=BD?= =?UTF-8?q?=D0=B5=D0=BA=D1=82-=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20=D1=81?= =?UTF-8?q?=D0=BB=D0=B5=D0=B4=D1=83=D1=8E=D1=82=20=D0=BC=D0=B0=D1=81=D1=88?= =?UTF-8?q?=D1=82=D0=B0=D0=B1=D1=83,=20=D0=BD=D0=BE=20=D0=B2=D1=81=D0=B5?= =?UTF-8?q?=D0=B3=D0=B4=D0=B0=20=D1=83=20=D0=B2=D0=B5=D1=80=D1=85=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt | 4 +--- .../kotlin/pw/binom/viewmate/glasses/ui/AssistantOverlay.kt | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt index cf9e6c1..f3ea153 100644 --- a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt +++ b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/MainActivity.kt @@ -65,7 +65,6 @@ import pw.binom.viewmate.glasses.ui.GlassesMovieScreen import pw.binom.viewmate.glasses.ui.Side import pw.binom.viewmate.glasses.ui.px import pw.binom.viewmate.glasses.ui.scaleOffsetX -import pw.binom.viewmate.glasses.ui.verticalOffsetY import pw.binom.viewmate.glasses.ui.panelOffsetX class MainActivity : BaseEventActivity() { @@ -460,7 +459,6 @@ fun ConnectionScreen() { val status by connection.status.collectAsState() val messages by connection.messages.collectAsState() val scale by GlassesApp.instance.scale.collectAsState() - val vertical by GlassesApp.instance.vertical.collectAsState() // Бинокулярно: контент дублируется в оба глаза, панель — по центру каждой // половины (явная ширина половины, иначе fillMaxSize растянет на 1280). @@ -483,7 +481,7 @@ fun ConnectionScreen() { .height(containerH.px) .offset( x = scaleOffsetX(side, screenWidthPx, scale).px, - y = verticalOffsetY(screenHeightPx, scale, vertical).px, + // вертикаль (vertical) — только для видео; здесь контент всегда у верха ) .background(Color.Black), ) { diff --git a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/ui/AssistantOverlay.kt b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/ui/AssistantOverlay.kt index 1c69e66..6402758 100644 --- a/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/ui/AssistantOverlay.kt +++ b/app-glasses/src/main/kotlin/pw/binom/viewmate/glasses/ui/AssistantOverlay.kt @@ -91,7 +91,6 @@ private fun overlayBox( ) { Binocular(scale = false) { val scale by app.scale.collectAsState() - val vertical by app.vertical.collectAsState() val screenWidthPx = BinocularScreenSize.current.width val screenHeightPx = BinocularScreenSize.current.height val side = BinocularScreenSide.current @@ -103,7 +102,7 @@ private fun overlayBox( .height(containerH.px) .offset( x = scaleOffsetX(side, screenWidthPx, scale).px, - y = verticalOffsetY(screenHeightPx, scale, vertical).px, + // вертикаль (vertical) — только для видео; оверлей всегда у верха ) .background(Color.Black.copy(alpha = 0.72f)), ) {