tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

carousel: fix scroll-up bug

Browse Source
This commit is contained in:
William Casarin
2023-05-29 16:09:16 -07:00
parent 06ba0f7387
commit 185fba150f
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
damus/Components/ImageCarousel.swift
View File

@@ -66,7 +66,7 @@ struct ImageCarousel: View {
@State private var fillHeight: CGFloat = 350 @State private var fillHeight: CGFloat = 350
@State private var maxHeight: CGFloat = UIScreen.main.bounds.height * 1.2 // 1.2 @State private var maxHeight: CGFloat = UIScreen.main.bounds.height * 1.2 // 1.2
@State private var firstImageHeight: CGFloat = UIScreen.main.bounds.height * 1.2 @State private var firstImageHeight: CGFloat? = nil
@State private var currentImageHeight: CGFloat? @State private var currentImageHeight: CGFloat?
@State private var selectedIndex = 0 @State private var selectedIndex = 0
@@ -84,7 +84,7 @@ struct ImageCarousel: View {
} }
var height: CGFloat { var height: CGFloat {
image_fill?.height ?? fillHeight firstImageHeight ?? image_fill?.height ?? fillHeight
} }
func Placeholder(url: URL, geo_size: CGSize, num_urls: Int) -> some View { func Placeholder(url: URL, geo_size: CGSize, num_urls: Int) -> some View {
@@ -147,8 +147,7 @@ struct ImageCarousel: View {
Placeholder(url: url, geo_size: geo.size, num_urls: urls.count) Placeholder(url: url, geo_size: geo.size, num_urls: urls.count)
} }
.aspectRatio(contentMode: filling ? .fill : .fit) .aspectRatio(contentMode: filling ? .fill : .fit)
//.frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center) .frame(maxWidth: .infinity, maxHeight: .infinity, alignment: .center)
.position(x: geo.size.width / 2, y: geo.size.height / 2)
.tabItem { .tabItem {
Text(url.absoluteString) Text(url.absoluteString)
} }
@@ -161,7 +160,7 @@ struct ImageCarousel: View {
.fullScreenCover(isPresented: $open_sheet) { .fullScreenCover(isPresented: $open_sheet) {
ImageView(urls: urls, disable_animation: state.settings.disable_animation) ImageView(urls: urls, disable_animation: state.settings.disable_animation)
} }
.frame(height: firstImageHeight) .frame(height: height)
.onTapGesture { .onTapGesture {
open_sheet = true open_sheet = true
} }