Skip to content

Commit f9b8354

Browse files
committed
Fix for storyboard usage
1 parent 316afe2 commit f9b8354

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

UIImageViewAligned.swift

+13-13
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ open class UIImageViewAligned: UIImageView {
4747
}
4848
}
4949

50-
override open var image: UIImage? {
50+
open override var image: UIImage? {
5151
set {
5252
realImageView?.image = newValue
5353
setNeedsLayout()
@@ -57,7 +57,7 @@ open class UIImageViewAligned: UIImageView {
5757
}
5858
}
5959

60-
override open var highlightedImage: UIImage? {
60+
open override var highlightedImage: UIImage? {
6161
set {
6262
realImageView?.highlightedImage = newValue
6363
setNeedsLayout()
@@ -123,7 +123,7 @@ open class UIImageViewAligned: UIImageView {
123123
}
124124
}
125125

126-
override open var isHighlighted: Bool {
126+
open override var isHighlighted: Bool {
127127
set {
128128
super.isHighlighted = newValue
129129
layer.contents = nil
@@ -167,7 +167,7 @@ open class UIImageViewAligned: UIImageView {
167167

168168
return size
169169
}
170-
170+
171171
public override init(frame: CGRect) {
172172
super.init(frame: frame)
173173
setup()
@@ -188,18 +188,24 @@ open class UIImageViewAligned: UIImageView {
188188
setup()
189189
}
190190

191-
override open func didMoveToSuperview() {
191+
open override func layoutSubviews() {
192+
super.layoutSubviews()
193+
layoutIfNeeded()
194+
updateLayout()
195+
}
196+
197+
open override func didMoveToSuperview() {
192198
super.didMoveToSuperview()
193199
layer.contents = nil
194200
}
195201

196-
override open func didMoveToWindow() {
202+
open override func didMoveToWindow() {
197203
super.didMoveToWindow()
198204
layer.contents = nil
199205
}
200206

201207
private func setup(image: UIImage? = nil, highlightedImage: UIImage? = nil) {
202-
realImageView = UIImageView(image: image, highlightedImage: highlightedImage)
208+
realImageView = UIImageView(image: image ?? super.image, highlightedImage: highlightedImage ?? super.highlightedImage)
203209
realImageView?.frame = bounds
204210
realImageView?.autoresizingMask = [.flexibleWidth, .flexibleHeight]
205211
realImageView?.contentMode = contentMode
@@ -230,12 +236,6 @@ open class UIImageViewAligned: UIImageView {
230236
layer.contents = nil
231237
}
232238

233-
override open func layoutSubviews() {
234-
super.layoutSubviews()
235-
layoutIfNeeded()
236-
updateLayout()
237-
}
238-
239239
private func setInspectableProperty(_ newValue: Bool, alignment: UIImageViewAlignmentMask) {
240240
if newValue {
241241
self.alignment.insert(alignment)

UIImageViewAlignedSwift.podspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "UIImageViewAlignedSwift"
3-
s.version = "0.4.0"
3+
s.version = "0.4.1"
44
s.summary = "A UIImageView subclass which allows you to align the image left/right/top/bottom, even when contentMode is AspectFit."
55
s.description = "It is a subclass of UIImageView that allows you to customize the alignment of the displayed image inside the view's frame. This works even if the contentMode is set to AspectFit, AspectFill or ScaleToFill."
66
s.homepage = "https://github.com/sochalewski/UIImageViewAlignedSwift"

0 commit comments

Comments
 (0)