From 532cb6c6809914cca81aec2e6641c15362f83cbb Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 27 Jun 2024 15:10:30 -0500 Subject: [PATCH 1/2] fixed animation Signed-off-by: Matt Bruce --- VDS/Components/Toggle/ToggleView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VDS/Components/Toggle/ToggleView.swift b/VDS/Components/Toggle/ToggleView.swift index 935ed519..dc5e9570 100644 --- a/VDS/Components/Toggle/ToggleView.swift +++ b/VDS/Components/Toggle/ToggleView.swift @@ -219,7 +219,7 @@ open class ToggleView: Control, Changeable, FormFieldable { } knobTrailingConstraint?.isActive = true knobLeadingConstraint?.isActive = true - setNeedsLayout() + layoutIfNeeded() } private func updateToggle() { From 99db2d3b1c1ebb48754e334e3ae8eb9a3f61f436 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Thu, 27 Jun 2024 13:16:52 -0500 Subject: [PATCH 2/2] align left Signed-off-by: Matt Bruce --- VDS/Components/DatePicker/DatePicker.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VDS/Components/DatePicker/DatePicker.swift b/VDS/Components/DatePicker/DatePicker.swift index cb2b5b88..17ededf4 100644 --- a/VDS/Components/DatePicker/DatePicker.swift +++ b/VDS/Components/DatePicker/DatePicker.swift @@ -370,7 +370,7 @@ extension DatePicker { var popoverY: CGFloat = 0 // Calculate horizontal position - if sourceFrameInParent.width < popoverWidth { + if sourceFrameInParent.width <= popoverWidth { if sourceFrameInParent.midX - popoverWidth / 2 < 0 { // Align to left popoverX = sourceFrameInParent.minX @@ -382,7 +382,7 @@ extension DatePicker { popoverX = sourceFrameInParent.midX - popoverWidth / 2 } } else { - popoverX = sourceFrameInParent.midX - popoverWidth / 2 + popoverX = sourceFrameInParent.minX //sourceFrameInParent.midX - popoverWidth / 2 } // Ensure the popover is within the parent's bounds horizontally