Authored by Stenmark

the property name 'view' is too generic, so changed it to 'labelView'

... ... @@ -111,7 +111,7 @@
- (void) tapOnLabelForMarker:(RMMarker*) marker onMap:(RMMapView*) map
{
NSLog(@"Label <0x%x, RC:%U> tapped for marker <0x%x, RC:%U>", marker.view, [marker.view retainCount], marker, [marker retainCount]);
NSLog(@"Label <0x%x, RC:%U> tapped for marker <0x%x, RC:%U>", marker.labelView, [marker.labelView retainCount], marker, [marker retainCount]);
[marker setTextLabel:[NSString stringWithFormat:@"Tapped! (%U)", ++tapCount]];
}
... ...
... ... @@ -20,7 +20,7 @@ extern NSString * const RMMarkerRedKey;
NSObject* data;
// A label which comes up when you tap the marker
UIView* view;
UIView* labelView;
}
+ (RMMarker*) markerWithNamedStyle: (NSString*) styleName;
... ... @@ -50,7 +50,7 @@ extern NSString * const RMMarkerRedKey;
@property (assign, nonatomic) RMXYPoint location;
@property (retain) NSObject* data;
@property (nonatomic, retain) UIView* view;
@property (nonatomic, retain) UIView* labelView;
// Call this with either RMMarkerBlue or RMMarkerRed for the key.
+ (CGImageRef) markerImage: (NSString *) key;
... ...
... ... @@ -22,7 +22,7 @@ static CGImageRef _markerBlue = nil;
@synthesize location;
@synthesize data;
@synthesize view;
@synthesize labelView;
+ (RMMarker*) markerWithNamedStyle: (NSString*) styleName
{
... ... @@ -44,7 +44,7 @@ static CGImageRef _markerBlue = nil;
self.anchorPoint = _anchorPoint;
self.masksToBounds = NO;
view = nil;
labelView = nil;
return self;
}
... ... @@ -56,7 +56,7 @@ static CGImageRef _markerBlue = nil;
self.anchorPoint = _anchorPoint;
self.masksToBounds = NO;
view = nil;
labelView = nil;
}
- (id) initWithUIImage: (UIImage*) image
... ... @@ -88,17 +88,17 @@ static CGImageRef _markerBlue = nil;
- (void) setLabel: (UIView*)aView
{
if (view != nil)
if (labelView != nil)
{
[[view layer] removeFromSuperlayer];
[view release];
view = nil;
[[labelView layer] removeFromSuperlayer];
[labelView release];
labelView = nil;
}
if (aView != nil)
{
view = [aView retain];
[self addSublayer:[view layer]];
labelView = [aView retain];
[self addSublayer:[labelView layer]];
}
}
... ... @@ -137,22 +137,22 @@ static CGImageRef _markerBlue = nil;
- (void) removeLabel
{
if (view != nil)
if (labelView != nil)
{
[[view layer] removeFromSuperlayer];
[view release];
view = nil;
[[labelView layer] removeFromSuperlayer];
[labelView release];
labelView = nil;
}
}
- (void) toggleLabel
{
if (view == nil) {
if (labelView == nil) {
return;
}
if ([view isHidden]) {
if ([labelView isHidden]) {
[self showLabel];
} else {
[self hideLabel];
... ... @@ -161,25 +161,25 @@ static CGImageRef _markerBlue = nil;
- (void) showLabel
{
if ([view isHidden]) {
if ([labelView isHidden]) {
// Using addSublayer will animate showing the label, whereas setHidden is not animated
[self addSublayer:[view layer]];
[view setHidden:NO];
[self addSublayer:[labelView layer]];
[labelView setHidden:NO];
}
}
- (void) hideLabel
{
if (![view isHidden]) {
if (![labelView isHidden]) {
// Using removeFromSuperlayer will animate hiding the label, whereas setHidden is not animated
[[view layer] removeFromSuperlayer];
[view setHidden:YES];
[[labelView layer] removeFromSuperlayer];
[labelView setHidden:YES];
}
}
- (void) dealloc
{
[view release];
[labelView release];
[data release];
[super dealloc];
}
... ...