Commit 29880f1e authored by 汪洋's avatar 汪洋

Merge branch 'wy/font'

parents b82eb6bc 2dfc2bc9
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#import "OCNavigatioinBar.h" #import "OCNavigatioinBar.h"
#import <Masonry/Masonry.h> #import <Masonry/Masonry.h>
#import "GMBaseUtil.h" #import "GMBaseUtil.h"
@import GMKit;
@interface OCNavigatioinBarButton () @interface OCNavigatioinBarButton ()
@property (nonatomic, assign) CGFloat adaptiveWidth; @property (nonatomic, assign) CGFloat adaptiveWidth;
...@@ -50,8 +51,8 @@ ...@@ -50,8 +51,8 @@
_titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; _titleLabel.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
_titleLabel.textAlignment = NSTextAlignmentCenter; _titleLabel.textAlignment = NSTextAlignmentCenter;
_titleLabel.backgroundColor = [UIColor clearColor]; _titleLabel.backgroundColor = [UIColor clearColor];
_titleLabel.textColor = [UIColor blackColor]; _titleLabel.textColor = HEADLINE_TEXT_COLOR;
_titleLabel.font = [UIFont navigationFontWithSize:16]; _titleLabel.font = [UIFont navigationFontWithSize:18];
_leftButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom]; _leftButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom];
_rightButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom]; _rightButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom];
_nearRightButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom]; _nearRightButton = [OCNavigatioinBarButton buttonWithType:UIButtonTypeCustom];
......
...@@ -42,6 +42,9 @@ ...@@ -42,6 +42,9 @@
_table.rowHeight = _cellHeight; _table.rowHeight = _cellHeight;
_table.delegate = self; _table.delegate = self;
_table.dataSource = self; _table.dataSource = self;
_table.estimatedRowHeight = 0;
_table.estimatedSectionHeaderHeight = 0;
_table.estimatedSectionFooterHeight = 0;
// 如果_cellIdentifier 能转成一个UITableViewCell class,才去注册,否则会有crash发生 // 如果_cellIdentifier 能转成一个UITableViewCell class,才去注册,否则会有crash发生
if ([NSClassFromString(_cellIdentifier) isSubclassOfClass:[UITableViewCell class]]) { if ([NSClassFromString(_cellIdentifier) isSubclassOfClass:[UITableViewCell class]]) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment