Various fixes

laktyushin · laktyushin · commit ee50fdcd149a · 2025-11-13T22:40:12.000+04:00
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraCollage.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraCollage.swift
@@ -1014,7 +1014,9 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {
             guard let self, let videoSource = self.cameraVideoSource, self.isEnabled else {
                 return
             }
-            self.cameraVideoLayer.video = videoSource.currentOutput
+            Queue.mainQueue().async {
+                self.cameraVideoLayer.video = videoSource.currentOutput
+            }
         }
         
         let videoSize = CGSize(width: 160.0 * 2.0, height: 284.0 * 2.0)
diff --git a/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift b/submodules/TelegramUI/Components/CameraScreen/Sources/CameraScreen.swift
@@ -1916,9 +1916,12 @@ private final class CameraScreenComponent: CombinedComponent {
                                 availableSize: CGSize(width: 40.0, height: 40.0),
                                 transition: .immediate
                             )
+                            if component.cameraState.isCollageEnabled {
+                                nextButtonX += 48.0
+                            }
                             var collageButtonX = nextButtonX
                             if rightMostButtonWidth.isZero {
-                                collageButtonX = availableSize.width - topControlSideInset - collageButton.size.width / 2.0 - 5.0
+                                collageButtonX = availableSize.width - topControlSideInset - collageButton.size.width / 2.0 - 54.0
                             }
                             context.add(collageButton
                                 .position(CGPoint(x: collageButtonX, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlVerticalInset) + collageButton.size.height / 2.0 + 2.0))

Original file line number	Diff line number	Diff line change
`@@ -1014,7 +1014,9 @@ final class CameraCollageView: UIView, UIGestureRecognizerDelegate {`
`1014`	`1014`	`guard let self, let videoSource = self.cameraVideoSource, self.isEnabled else {`
`1015`	`1015`	`return`
`1016`	`1016`	`}`
`1017`		`- self.cameraVideoLayer.video = videoSource.currentOutput`
	`1017`	`+ Queue.mainQueue().async {`
	`1018`	`+ self.cameraVideoLayer.video = videoSource.currentOutput`
	`1019`	`+ }`
`1018`	`1020`	`}`
`1019`	`1021`
`1020`	`1022`	`let videoSize = CGSize(width: 160.0 * 2.0, height: 284.0 * 2.0)`
Original file line number	Diff line number	Diff line change
`@@ -1916,9 +1916,12 @@ private final class CameraScreenComponent: CombinedComponent {`
`1916`	`1916`	`availableSize: CGSize(width: 40.0, height: 40.0),`
`1917`	`1917`	`transition: .immediate`
`1918`	`1918`	`)`
	`1919`	`+ if component.cameraState.isCollageEnabled {`
	`1920`	`+ nextButtonX += 48.0`
	`1921`	`+ }`
`1919`	`1922`	`var collageButtonX = nextButtonX`
`1920`	`1923`	`if rightMostButtonWidth.isZero {`
`1921`		`- collageButtonX = availableSize.width - topControlSideInset - collageButton.size.width / 2.0 - 5.0`
	`1924`	`+ collageButtonX = availableSize.width - topControlSideInset - collageButton.size.width / 2.0 - 54.0`
`1922`	`1925`	`}`
`1923`	`1926`	`context.add(collageButton`
`1924`	`1927`	`.position(CGPoint(x: collageButtonX, y: max(environment.statusBarHeight + 5.0, environment.safeInsets.top + topControlVerticalInset) + collageButton.size.height / 2.0 + 2.0))`