Skip to content

Commit b6470ff

Browse files
committed
code style fix
- Corner Radius fix - frame calculation fix
1 parent f21599a commit b6470ff

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Sources/ComponentsKit/ProgressBar/Models/ProgressBarVM.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ extension ProgressBarVM {
8080
}
8181

8282
var innerCornerRadius: CGFloat {
83-
let distance: CGFloat = 3
84-
return max(0, self.computedCornerRadius - distance)
83+
return max(0, self.computedCornerRadius - self.innerBarPadding)
8584
}
8685

8786
var backgroundColor: UniversalColor {

Sources/ComponentsKit/ProgressBar/SUProgressBar.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public struct SUProgressBar: View {
5858

5959
RoundedRectangle(cornerRadius: self.model.innerCornerRadius)
6060
.foregroundStyle(self.model.color.contrast.color)
61-
.frame(width: (geometry.size.width - 6) * self.progress, height: self.model.barHeight - 6)
61+
.frame(width: (geometry.size.width - self.model.innerBarPadding * 2) * self.progress, height: self.model.barHeight - self.model.innerBarPadding * 2)
6262
.padding(.vertical, self.model.innerBarPadding)
6363
.padding(.horizontal, self.model.innerBarPadding)
6464
}
@@ -72,7 +72,7 @@ public struct SUProgressBar: View {
7272

7373
RoundedRectangle(cornerRadius: self.model.innerCornerRadius)
7474
.foregroundStyle(self.model.color.contrast.color)
75-
.frame(width: (geometry.size.width - 6) * self.progress, height: self.model.barHeight - 6)
75+
.frame(width: (geometry.size.width - self.model.innerBarPadding * 2) * self.progress, height: self.model.barHeight - self.model.innerBarPadding * 2)
7676
.padding(.vertical, self.model.innerBarPadding)
7777
.padding(.horizontal, self.model.innerBarPadding)
7878

0 commit comments

Comments
 (0)