Various Fixes

This commit is contained in:
Ilya Laktyushin 2021-07-27 23:18:38 +03:00
parent 4195dcf129
commit 618a516c47
3 changed files with 20 additions and 12 deletions

View File

@ -2679,7 +2679,9 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
{
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);
else if (widescreenWidth == 812.0f)
return CGRectMake(0, 77, screenSize.width, screenSize.height - 77 - 68);
@ -2705,7 +2707,7 @@ static CGPoint TGCameraControllerClampPointToScreenSize(__unused id self, __unus
default:
{
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)
return CGRectMake(0, 121, screenSize.width, screenSize.height - 121 - 223);
else if (widescreenWidth == 844.0f)

View File

@ -113,11 +113,11 @@
CGFloat widescreenWidth = MAX(screenSize.width, screenSize.height);
if (widescreenWidth == 926.0f)
{
_topPanelOffset = 77.0f;
_topPanelOffset = 34.0f;
_topPanelHeight = 77.0f;
_bottomPanelOffset = 94.0f;
_bottomPanelHeight = 155.0f;
_modeControlOffset = 6.0f;
_bottomPanelHeight = 140.0f;
_modeControlOffset = -2.0f;
_modeControlHeight = 66.0f;
_counterOffset = 7.0f;
shutterButtonWidth = 72.0f;
@ -133,7 +133,7 @@
_counterOffset = 7.0f;
shutterButtonWidth = 72.0f;
}
if (widescreenWidth == 844.0f)
else if (widescreenWidth == 844.0f)
{
_topPanelOffset = 33.0f;
_topPanelHeight = 44.0f;

View File

@ -343,8 +343,10 @@
}
- (void)leftPressed {
if (_zoomLevel != 0.5) {
[self setZoomLevel:0.5 animated:true];
self.zoomChanged(0.5, true, true);
}
}
- (void)centerPressed {
@ -362,14 +364,18 @@
self.zoomChanged(1.0, true, true);
}
} else {
if (_zoomLevel != 1.0) {
[self setZoomLevel:1.0 animated:true];
self.zoomChanged(1.0, true, true);
}
}
}
- (void)rightPressed {
if (_zoomLevel != 2.0) {
[self setZoomLevel:2.0 animated:true];
self.zoomChanged(2.0, true, true);
}
}
- (void)setZoomLevel:(CGFloat)zoomLevel {