ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-24 07:05:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into experimental-2

Browse Source 
# Conflicts:
#	submodules/ChatListUI/Sources/ChatContextMenus.swift
#	submodules/TelegramCore/Sources/TelegramEngine/Calls/GroupCalls.swift
This commit is contained in:
Ali
2021-07-18 01:10:29 +02:00
parent 1dc2d3c8ba b888551106
commit 617bcc314e
139 changed files with 3459 additions and 1015 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
View File

@@ -1414,7 +1414,7 @@ static CGFloat progressOfSampleBufferInTimeRange(CMSampleBufferRef sampleBuffer,
return 64;
case TGMediaVideoConversionPresetVideoMessage:
return 32;
return 64;
case TGMediaVideoConversionPresetAnimation:
case TGMediaVideoConversionPresetProfile:

5
submodules/LegacyComponents/Sources/TGPhotoPaintController.m
View File

@@ -1414,7 +1414,7 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f;
- (CGFloat)_brushWeightForSize:(CGFloat)size
{
return [self _brushBaseWeightForCurrentPainting] + [self _brushWeightRangeForCurrentPainting] * size;
return ([self _brushBaseWeightForCurrentPainting] + [self _brushWeightRangeForCurrentPainting] * size) / _scrollView.zoomScale;
}
+ (CGSize)maximumPaintingSize
@@ -1739,6 +1739,9 @@ const CGFloat TGPhotoPaintStickerKeyboardSize = 260.0f;
{
[self adjustZoom];
TGPaintSwatch *currentSwatch = _portraitSettingsView.swatch;
[_canvasView setBrushWeight:[self _brushWeightForSize:currentSwatch.brushWeight]];
if (_scrollView.zoomScale < _scrollView.normalZoomScale - FLT_EPSILON)
{
[TGHacks setAnimationDurationFactor:0.5f];