Skip to content

Commit 0590f98

Browse files
Merge pull request #53 from componentskit/fix-bugs
Fix bugs
2 parents 035e486 + cffc156 commit 0590f98

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

Sources/ComponentsKit/Components/ProgressBar/Models/ProgressBarVM.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ extension ProgressBarVM {
5959
}
6060

6161
var progressHeight: CGFloat {
62-
return self.backgroundHeight - self.progressPadding
62+
return self.backgroundHeight - self.progressPadding * 2
6363
}
6464

6565
func cornerRadius(for height: CGFloat) -> CGFloat {

Sources/ComponentsKit/Components/ProgressBar/SUProgressBar.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ public struct SUProgressBar: View {
7070
StripesShape(model: self.model)
7171
.foregroundStyle(self.model.color.main.color)
7272
.cornerRadius(self.model.cornerRadius(for: self.model.progressHeight))
73-
.clipped()
73+
.frame(width: (geometry.size.width - self.model.progressPadding * 2) * self.progress)
74+
.padding(.vertical, self.model.progressPadding)
75+
.padding(.horizontal, self.model.progressPadding)
7476
}
7577
}
7678
}

Sources/ComponentsKit/Components/SegmentedControl/Models/SegmentedControlVM.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ extension SegmentedControlVM {
102102
case .none, .full, .custom:
103103
return componentRadius
104104
case .small, .medium, .large:
105-
return max(0, componentRadius - self.outerPaddings / 2)
105+
return max(0, componentRadius - self.outerPaddings)
106106
}
107107
}
108108
func preferredFont(for id: ID) -> UniversalFont {

0 commit comments

Comments
 (0)