mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-06-16 05:55:20 +00:00
Various Fixes
This commit is contained in:
parent
4195dcf129
commit
618a516c47
@ -2679,7 +2679,9 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
|
|||||||
{
|
{
|
||||||
case PGCameraModeVideo:
|
case PGCameraModeVideo:
|
||||||
{
|
{
|
||||||
if (widescreenWidth == 896.0f)
|
if (widescreenWidth == 926.0f)
|
||||||
|
return CGRectMake(0, 82, screenSize.width, screenSize.height - 82 - 83);
|
||||||
|
else if (widescreenWidth == 896.0f)
|
||||||
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 83);
|
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 83);
|
||||||
else if (widescreenWidth == 812.0f)
|
else if (widescreenWidth == 812.0f)
|
||||||
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68);
|
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68);
|
||||||
@ -2705,7 +2707,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
|
|||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
if (widescreenWidth == 926.0f)
|
if (widescreenWidth == 926.0f)
|
||||||
return CGRectMake(0, 154, screenSize.width, screenSize.height - 154 - 249);
|
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 234);
|
||||||
if (widescreenWidth == 896.0f)
|
if (widescreenWidth == 896.0f)
|
||||||
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 223);
|
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 223);
|
||||||
else if (widescreenWidth == 844.0f)
|
else if (widescreenWidth == 844.0f)
|
||||||
|
@ -113,11 +113,11 @@
|
|||||||
CGFloat widescreenWidth = MAX(screenSize.width, screenSize.height);
|
CGFloat widescreenWidth = MAX(screenSize.width, screenSize.height);
|
||||||
if (widescreenWidth == 926.0f)
|
if (widescreenWidth == 926.0f)
|
||||||
{
|
{
|
||||||
_topPanelOffset = 77.0f;
|
_topPanelOffset = 34.0f;
|
||||||
_topPanelHeight = 77.0f;
|
_topPanelHeight = 77.0f;
|
||||||
_bottomPanelOffset = 94.0f;
|
_bottomPanelOffset = 94.0f;
|
||||||
_bottomPanelHeight = 155.0f;
|
_bottomPanelHeight = 140.0f;
|
||||||
_modeControlOffset = 6.0f;
|
_modeControlOffset = -2.0f;
|
||||||
_modeControlHeight = 66.0f;
|
_modeControlHeight = 66.0f;
|
||||||
_counterOffset = 7.0f;
|
_counterOffset = 7.0f;
|
||||||
shutterButtonWidth = 72.0f;
|
shutterButtonWidth = 72.0f;
|
||||||
@ -133,7 +133,7 @@
|
|||||||
_counterOffset = 7.0f;
|
_counterOffset = 7.0f;
|
||||||
shutterButtonWidth = 72.0f;
|
shutterButtonWidth = 72.0f;
|
||||||
}
|
}
|
||||||
if (widescreenWidth == 844.0f)
|
else if (widescreenWidth == 844.0f)
|
||||||
{
|
{
|
||||||
_topPanelOffset = 33.0f;
|
_topPanelOffset = 33.0f;
|
||||||
_topPanelHeight = 44.0f;
|
_topPanelHeight = 44.0f;
|
||||||
|
@ -343,8 +343,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
- (void)leftPressed {
|
- (void)leftPressed {
|
||||||
[self setZoomLevel:0.5 animated:true];
|
if (_zoomLevel != 0.5) {
|
||||||
self.zoomChanged(0.5, true, true);
|
[self setZoomLevel:0.5 animated:true];
|
||||||
|
self.zoomChanged(0.5, true, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)centerPressed {
|
- (void)centerPressed {
|
||||||
@ -362,14 +364,18 @@
|
|||||||
self.zoomChanged(1.0, true, true);
|
self.zoomChanged(1.0, true, true);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
[self setZoomLevel:1.0 animated:true];
|
if (_zoomLevel != 1.0) {
|
||||||
self.zoomChanged(1.0, true, true);
|
[self setZoomLevel:1.0 animated:true];
|
||||||
|
self.zoomChanged(1.0, true, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)rightPressed {
|
- (void)rightPressed {
|
||||||
[self setZoomLevel:2.0 animated:true];
|
if (_zoomLevel != 2.0) {
|
||||||
self.zoomChanged(2.0, true, true);
|
[self setZoomLevel:2.0 animated:true];
|
||||||
|
self.zoomChanged(2.0, true, true);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
- (void)setZoomLevel:(CGFloat)zoomLevel {
|
- (void)setZoomLevel:(CGFloat)zoomLevel {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user