mirror of
https://github.com/leonboe1/QuickDrop.git
synced 2026-11-21 22:05:59 +00:00
Fix toast view appearance
This commit is contained in:
1 parent
811b991fcd
commit
be4d342894
2 files changed
+19
-6
No files matched your search
@@ -1739,8 +1739,8 @@
|
|||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
ONLY_ACTIVE_ARCH = YES;
|
ONLY_ACTIVE_ARCH = YES;
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SHARED_BUILD = 128;
|
SHARED_BUILD = 129;
|
||||||
SHARED_VERSION = 2.13.2;
|
SHARED_VERSION = 2.13.3;
|
||||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||||
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
|
||||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||||
@@ -1802,8 +1802,8 @@
|
|||||||
MTL_ENABLE_DEBUG_INFO = NO;
|
MTL_ENABLE_DEBUG_INFO = NO;
|
||||||
MTL_FAST_MATH = YES;
|
MTL_FAST_MATH = YES;
|
||||||
SDKROOT = macosx;
|
SDKROOT = macosx;
|
||||||
SHARED_BUILD = 128;
|
SHARED_BUILD = 129;
|
||||||
SHARED_VERSION = 2.13.2;
|
SHARED_VERSION = 2.13.3;
|
||||||
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
STRING_CATALOG_GENERATE_SYMBOLS = YES;
|
||||||
SWIFT_COMPILATION_MODE = wholemodule;
|
SWIFT_COMPILATION_MODE = wholemodule;
|
||||||
SWIFT_EMIT_LOC_STRINGS = YES;
|
SWIFT_EMIT_LOC_STRINGS = YES;
|
||||||
|
|||||||
@@ -259,11 +259,13 @@ struct QuickDropToastHostView: View {
|
|||||||
@ObservedObject var receiveModel: ReceiveModel
|
@ObservedObject var receiveModel: ReceiveModel
|
||||||
let onCancel: () -> Void
|
let onCancel: () -> Void
|
||||||
|
|
||||||
|
@State private var didRenderOnce = false
|
||||||
|
|
||||||
private let slideAnimation = Animation.smooth
|
private let slideAnimation = Animation.smooth
|
||||||
private let fadeAnimation = Animation.easeInOut
|
private let fadeAnimation = Animation.easeInOut
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
let isVisible = receiveModel.toastIsVisible
|
let isVisible = didRenderOnce && receiveModel.toastIsVisible
|
||||||
let isSlide = receiveModel.toastDismissStyle == .slide
|
let isSlide = receiveModel.toastDismissStyle == .slide
|
||||||
let hiddenOffset: CGFloat = isSlide ? toastSlideDistance : 0
|
let hiddenOffset: CGFloat = isSlide ? toastSlideDistance : 0
|
||||||
let hiddenOpacity: Double = isSlide ? 1 : 0
|
let hiddenOpacity: Double = isSlide ? 1 : 0
|
||||||
@@ -275,9 +277,20 @@ struct QuickDropToastHostView: View {
|
|||||||
.offset(x: isVisible ? 0 : hiddenOffset)
|
.offset(x: isVisible ? 0 : hiddenOffset)
|
||||||
.opacity(isVisible ? 1 : hiddenOpacity)
|
.opacity(isVisible ? 1 : hiddenOpacity)
|
||||||
.blur(radius: isVisible ? 0 : hiddenBlur)
|
.blur(radius: isVisible ? 0 : hiddenBlur)
|
||||||
.animation(animation, value: receiveModel.toastIsVisible)
|
.animation(animation, value: isVisible)
|
||||||
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .trailing)
|
.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .trailing)
|
||||||
.padding(.trailing, toastTrailingPadding)
|
.padding(.trailing, toastTrailingPadding)
|
||||||
|
.onAppear {
|
||||||
|
// Defer the visibility gate one run-loop tick so initial state is
|
||||||
|
// always rendered hidden before we animate to visible.
|
||||||
|
guard !didRenderOnce else { return }
|
||||||
|
DispatchQueue.main.async {
|
||||||
|
didRenderOnce = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
.onDisappear {
|
||||||
|
didRenderOnce = false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user