Merge MatrixKit develop with commit hash: b85b736313bec0592bd1cabc68035d97f5331137

Riot/Modules/MatrixKit/Views/MXKTableViewCell/MXKTableViewCellWithLabelAndImageView.m

@@ -0,0 +1,44 @@
+/*
+ Copyright 2015 OpenMarket Ltd
+ 
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ 
+ http://www.apache.org/licenses/LICENSE-2.0
+ 
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ */
+
+#import "MXKTableViewCellWithLabelAndImageView.h"
+
+@implementation MXKTableViewCellWithLabelAndImageView
+
+- (void)layoutSubviews
+{
+    [super layoutSubviews];
+    
+    if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeCircle)
+    {
+        // Round image view for thumbnail
+        _mxkImageView.layer.cornerRadius = _mxkImageView.frame.size.width / 2;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else if (self.mxkImageViewDisplayBoxType == MXKTableViewCellDisplayBoxTypeRoundedCorner)
+    {
+        _mxkImageView.layer.cornerRadius = 5;
+        _mxkImageView.clipsToBounds = YES;
+    }
+    else
+    {
+        _mxkImageView.layer.cornerRadius = 0;
+        _mxkImageView.clipsToBounds = NO;
+    }
+}
+
+@end
+