tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

iOS: fix hintFont default is font

Browse Source
This commit is contained in:
pengfei.zhou 2021-09-09 15:10:42 +08:00 committed by osborn
parent 145e157558
commit 116469d52c
1 changed files with 15 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
doric-iOS/Pod/Classes/Shader/DoricInputNode.m
View File

@ -129,6 +129,7 @@ - (void)setTextAlignment:(NSTextAlignment)textAlignment {
@interface DoricInputView () @interface DoricInputView ()
@property(nonatomic, strong) DoricMultilineInput *multiLineInput; @property(nonatomic, strong) DoricMultilineInput *multiLineInput;
@property(nonatomic, strong) DoricSingleLineInput *singleLineInput; @property(nonatomic, strong) DoricSingleLineInput *singleLineInput;
@property(nonatomic, strong) UIFont *hintFont;
@end @end
@implementation DoricInputView @implementation DoricInputView
@ -207,7 +208,6 @@ - (NSString *)text {
- (void)setFont:(UIFont *)font { - (void)setFont:(UIFont *)font {
self.multiLineInput.font = font; self.multiLineInput.font = font;
self.multiLineInput.placeholderLabel.font = font;
self.singleLineInput.font = font; self.singleLineInput.font = font;
} }
@ -247,13 +247,6 @@ - (NSTextAlignment)textAlignment {
- (void)setHintText:(NSString *)text { - (void)setHintText:(NSString *)text {
self.multiLineInput.placeholderLabel.text = text; self.multiLineInput.placeholderLabel.text = text;
if (text) {
self.singleLineInput.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.multiLineInput.placeholderLabel.text
attributes:@{
NSForegroundColorAttributeName: self.multiLineInput.placeholderLabel.textColor,
NSFontAttributeName: self.multiLineInput.placeholderLabel.font}];
}
} }
- (NSString *)hintText { - (NSString *)hintText {
@ -266,24 +259,11 @@ - (NSString *)hintText {
- (void)setHintTextColor:(UIColor *)color { - (void)setHintTextColor:(UIColor *)color {
self.multiLineInput.placeholderLabel.textColor = color; self.multiLineInput.placeholderLabel.textColor = color;
if (self.multiLineInput.placeholderLabel.text) {
self.singleLineInput.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.multiLineInput.placeholderLabel.text
attributes:@{
NSForegroundColorAttributeName: self.multiLineInput.placeholderLabel.textColor,
NSFontAttributeName: self.multiLineInput.placeholderLabel.font}];
}
} }
- (void)setHintFont:(UIFont *)font { - (void)setHintFont:(UIFont *)font {
_hintFont = font;
self.multiLineInput.placeholderLabel.font = font; self.multiLineInput.placeholderLabel.font = font;
if (self.multiLineInput.placeholderLabel.text) {
self.singleLineInput.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.multiLineInput.placeholderLabel.text
attributes:@{
NSForegroundColorAttributeName: self.multiLineInput.placeholderLabel.textColor,
NSFontAttributeName: self.multiLineInput.placeholderLabel.font}];
}
} }
- (void)setKeyboardType:(UIKeyboardType)keyboardType { - (void)setKeyboardType:(UIKeyboardType)keyboardType {
@ -471,14 +451,19 @@ - (void)blend:(NSDictionary *)props {
- (void)afterBlended:(NSDictionary *)props { - (void)afterBlended:(NSDictionary *)props {
[super afterBlended:props]; [super afterBlended:props];
if (self.view.multiline) { UIFont *font = self.view.hintFont;
UIFont *font = self.view.multiLineInput.placeholderLabel.font; if (font) {
if (font) { self.view.multiLineInput.placeholderLabel.font = [self.view.multiLineInput.placeholderLabel.font fontWithSize:self.view.font.pointSize];
self.view.multiLineInput.placeholderLabel.font = [self.view.multiLineInput.placeholderLabel.font fontWithSize:self.view.font.pointSize]; } else {
} else { self.view.multiLineInput.placeholderLabel.font = self.view.multiLineInput.font;
self.view.multiLineInput.placeholderLabel.font = self.view.multiLineInput.font; }
} self.view.multiLineInput.placeholderLabel.numberOfLines = self.view.multiLineInput.textContainer.maximumNumberOfLines;
self.view.multiLineInput.placeholderLabel.numberOfLines = self.view.multiLineInput.textContainer.maximumNumberOfLines; if (self.view.multiLineInput.placeholderLabel.text) {
self.view.singleLineInput.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.view.multiLineInput.placeholderLabel.text
attributes:@{
NSForegroundColorAttributeName: self.view.multiLineInput.placeholderLabel.textColor,
NSFontAttributeName: self.view.multiLineInput.placeholderLabel.font}];
} }
} }