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

Merge branch 'master' into update-objc

Browse Source 
Conflicts:
	AsyncDisplayKit/Private/ASDisplayNode+FrameworkPrivate.h
This commit is contained in:
Adlai Holler
2015-12-22 00:28:21 -05:00
parent e202b18db9 d7492b331f
commit 69767d558e
103 changed files with 2968 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
AsyncDisplayKit/ASMapNode.h
View File

@@ -13,7 +13,10 @@ NS_ASSUME_NONNULL_BEGIN
@interface ASMapNode : ASImageNode
- (instancetype)initWithCoordinate:(CLLocationCoordinate2D)coordinate NS_DESIGNATED_INITIALIZER;
/**
The current region of ASMapNode. This can be set at any time and ASMapNode will animate the change.
*/
@property (nonatomic, assign) MKCoordinateRegion region;
/**
This is the MKMapView that is the live map part of ASMapNode. This will be nil if .liveMap = NO. Note, MKMapView is *not* thread-safe.