ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix text color in drawing screen when system dark appearance is set

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-02-26 02:18:44 +04:00
parent 9e57f852e5
commit 239178c8d6
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/LegacyComponents/Sources/TGPhotoPaintColorPicker.m
View File

@ -696,8 +696,8 @@ static void addRoundedRectToPath(CGContextRef context, CGRect rect, CGFloat oval
(id)UIColorRGB(0x80c864).CGColor, //green
(id)UIColorRGB(0xfcde65).CGColor, //yellow
(id)UIColorRGB(0xfc964d).CGColor, //orange
(id)[UIColor blackColor].CGColor, //black
(id)[UIColor whiteColor].CGColor //white
(id)UIColorRGB(0x000000).CGColor, //black
(id)UIColorRGB(0xffffff).CGColor //white
];
});
return colors;

21
submodules/LegacyComponents/Sources/TGPhotoTextEntityView.m
View File

@ -187,7 +187,7 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
_style = style;
switch (_style) {
case TGPhotoPaintTextEntityStyleRegular:
_textView.layer.shadowColor = [[UIColor blackColor] CGColor];
_textView.layer.shadowColor = [UIColorRGB(0x000000) CGColor];
_textView.layer.shadowOffset = CGSizeMake(0.0f, 4.0f);
_textView.layer.shadowOpacity = 0.4f;
_textView.layer.shadowRadius = 4.0f;
@ -218,7 +218,7 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
case TGPhotoPaintTextEntityStyleOutlined:
{
_textView.textColor = [UIColor whiteColor];
_textView.textColor = UIColorRGB(0xffffff);
_textView.strokeColor = _swatch.color;
_textView.frameColor = nil;
}
@ -238,9 +238,9 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
}
if (lightness > 0.87) {
_textView.textColor = [UIColor blackColor];
_textView.textColor = UIColorRGB(0x000000);
} else {
_textView.textColor = [UIColor whiteColor];
_textView.textColor = UIColorRGB(0xffffff);
}
_textView.strokeColor = nil;
_textView.frameColor = _swatch.color;
@ -484,6 +484,7 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
@implementation TGPhotoTextView
{
UIFont *_font;
UIColor *_forcedTextColor;
}
- (instancetype)initWithFrame:(CGRect)frame
@ -564,6 +565,11 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
self.layoutManager.textContainers.firstObject.lineFragmentPadding = floor(font.pointSize * 0.3);
}
- (void)setTextColor:(UIColor *)textColor {
_forcedTextColor = textColor;
[super setTextColor:textColor];
}
- (void)insertText:(NSString *)text {
[self fixTypingAttributes];
[super insertText:text];
@ -577,9 +583,14 @@ const CGFloat TGPhotoTextSelectionViewHandleSide = 30.0f;
}
- (void)fixTypingAttributes {
NSMutableDictionary *attributes = [[NSMutableDictionary alloc] init];
if (_font != nil) {
self.typingAttributes = @{NSFontAttributeName: _font};
attributes[NSFontAttributeName] = _font;
}
if (_forcedTextColor != nil) {
attributes[NSForegroundColorAttributeName] = _forcedTextColor;
}
self.typingAttributes = attributes;
}
@end