Fixes for borderColor and contentsScale from pull request #2.

Clarify definition of borderColor. Fix implementation of borderColor. Introduce synthesis of contentsScale.
gnustep · Jun 7, 2018 · 794a903 · 794a903
1 parent b02b4f6
commit 794a903
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-07  Ivan Vučica <ivan@vucica.net>
+
+	* Headers/QuartzCore/CALayer.h
+	* Source/CALayer.m:
+	Clarify definition of borderColor. Fix implementation of
+	borderColor. Introduce synthesis of contentsScale.
+
 2018-06-07  Ivan Vučica <ivan@vucica.net>
 
 	* Headers/QuartzCore/CAAnimation.h

diff --git a/Headers/QuartzCore/CALayer.h b/Headers/QuartzCore/CALayer.h
@@ -208,8 +208,7 @@ extern NSString *const kCATransition;
 - (CGAffineTransform) affineTransform;
 - (void) setAffineTransform: (CGAffineTransform)affineTransform;
 
-@property (nonatomic, assign) CGColorRef borderColor;
-
+@property (nonatomic, assign) CGColorRef borderColor; /* retained by CG */
 @property (nonatomic, assign) CGFloat contentsScale;
 @property (nonatomic, assign) CGFloat anchorPointZ;
 @end

diff --git a/Source/CALayer.m b/Source/CALayer.m
@@ -99,6 +99,7 @@ @implementation CALayer
 @synthesize actions=_actions;
 @synthesize style=_style;
 @synthesize borderColor=_borderColor;
+@synthesize contentsScale=_contentsScale;
 
 @synthesize shadowColor=_shadowColor;
 @synthesize shadowOffset=_shadowOffset;
@@ -276,7 +277,7 @@ - (id) init
       static NSString * keys[] = {
         @"anchorPoint", @"transform", @"sublayerTransform",
         @"opacity", @"delegate", @"contentsRect", @"shouldRasterize",
-        @"backgroundColor", @"borderColor",
+        @"backgroundColor", @"borderColor", @"contentsScale",
 
         @"beginTime", @"duration", @"speed", @"autoreverses",
         @"repeatCount",
@@ -375,6 +376,7 @@ - (id) initWithLayer: (CALayer*)layer
       [self setGeometryFlipped: [layer isGeometryFlipped]];
       [self setBackgroundColor: [layer backgroundColor]];
       [self setBorderColor: [layer borderColor]];
+      [self setContentsScale: [layer contentsScale]];
       [self setMasksToBounds: [layer masksToBounds]];
       [self setContentsRect: [layer contentsRect]];
       [self setHidden: [layer isHidden]];
@@ -1181,7 +1183,7 @@ - (void)setValue: (id)value
     }
   if ([key isEqualToString: @"borderColor"])
     {
-      [self setborderColor: (CGColorRef)value];
+      [self setBorderColor: (CGColorRef)value];
       return;
     }
   if ([key isEqualToString: @"shadowColor"])