Merge branch 'master' into remove-tuiimage
This commit is contained in:
@@ -22,8 +22,8 @@
|
||||
TUITableView *_tableView;
|
||||
ExampleTabBar *_tabBar;
|
||||
|
||||
TUIFont *exampleFont1;
|
||||
TUIFont *exampleFont2;
|
||||
NSFont *exampleFont1;
|
||||
NSFont *exampleFont2;
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
self.backgroundColor = [TUIColor colorWithWhite:0.9 alpha:1.0];
|
||||
|
||||
// if you're using a font a lot, it's best to allocate it once and re-use it
|
||||
exampleFont1 = [TUIFont fontWithName:@"HelveticaNeue" size:15];
|
||||
exampleFont2 = [TUIFont fontWithName:@"HelveticaNeue-Bold" size:15];
|
||||
exampleFont1 = [NSFont fontWithName:@"HelveticaNeue" size:15];
|
||||
exampleFont2 = [NSFont fontWithName:@"HelveticaNeue-Bold" size:15];
|
||||
|
||||
CGRect b = self.bounds;
|
||||
b.origin.y += TAB_HEIGHT;
|
||||
|
||||
Reference in New Issue
Block a user