Fix last line text alignment when using padding insets (Juanpe#477)

pawriwes · Jan 8, 2022 · 8ba4807 · 8ba4807
1 parent a098038
commit 8ba4807
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/SkeletonViewCore/Sources/Internal/UIKitExtensions/CALayer+Extensions.swift b/SkeletonViewCore/Sources/Internal/UIKitExtensions/CALayer+Extensions.swift
@@ -88,15 +88,16 @@ extension CALayer {
 
 private extension CALayer {
 
-    func alignLayerFrame(_ rect: CGRect, alignment: NSTextAlignment, isRTL: Bool) -> CGRect {
+    func alignLayerFrame(_ rect: CGRect, paddingInsets: UIEdgeInsets, alignment: NSTextAlignment, isRTL: Bool) -> CGRect {
         var newRect = rect
+        let superlayerWidth = (superlayer?.bounds.width ?? 0)
 
         switch alignment {
         case .natural where isRTL,
              .right:
-            newRect.origin.x = (superlayer?.bounds.width ?? 0) - rect.origin.x - rect.width
+            newRect.origin.x = superlayerWidth - rect.width - paddingInsets.right
         case .center:
-            newRect.origin.x = rect.origin.x + ((superlayer?.bounds.width ?? 0) - rect.width) / 2
+            newRect.origin.x = (superlayerWidth + paddingInsets.left - paddingInsets.right - rect.width) / 2
         case .natural, .left, .justified:
             break
         @unknown default:
@@ -211,7 +212,7 @@ extension CALayer {
                               height: size.height)
 
         if index == totalLines - 1 {
-            frame = alignLayerFrame(newFrame, alignment: alignment, isRTL: isRTL)
+            frame = alignLayerFrame(newFrame, paddingInsets: paddingInsets, alignment: alignment, isRTL: isRTL)
         } else {
             frame = newFrame
         }