fix: iPad reading width

EhPanda-Team · May 24, 2021 · 38a7f62 · 38a7f62
1 parent 7393f6f
commit 38a7f62
Showing 1 changed file with 22 additions and 5 deletions.
diff --git a/EhPanda/View/Content/ContentView.swift b/EhPanda/View/Content/ContentView.swift
@@ -67,7 +67,10 @@ struct ContentView: View, StoreAccessor {
                                         retryLimit: setting.contentRetryLimit,
                                         onSuccessAction: onWebImageSuccess
                                     )
-                                    .frame(height: calImageHeight(item.tag))
+                                    .frame(
+                                        width: absoluteScreenW,
+                                        height: calImageHeight(item.tag)
+                                    )
                                     .onAppear {
                                         onWebImageAppear(item)
                                     }
@@ -121,7 +124,7 @@ struct ContentView: View, StoreAccessor {
                 for: Notification.Name("DetailViewOnDisappear")
             )
         ) { _ in
-            onReceiveDetailViewOnDisappearNotification()
+            onDetailViewDisappear()
         }
         .onReceive(
             NotificationCenter.default.publisher(
@@ -137,6 +140,13 @@ struct ContentView: View, StoreAccessor {
         ) { _ in
             onResignActive()
         }
+        .onReceive(
+            NotificationCenter.default.publisher(
+                for: NSNotification.Name("AppWidthDidChange")
+            )
+        ) { _ in
+            onWidthChange()
+        }
         .onAppear(perform: onAppear)
         .onDisappear(perform: onDisappear)
         .navigationBarBackButtonHidden(true)
@@ -175,9 +185,16 @@ private extension ContentView {
         saveAspectBox()
         saveReadingProgress()
     }
-    func onReceiveDetailViewOnDisappearNotification() {
+    func onDetailViewDisappear() {
         toggleNavBarHiddenIfNeeded()
     }
+    func onWidthChange() {
+        DispatchQueue.main.async {
+            setOffset(.zero)
+            setScale(1.1)
+            setScale(1)
+        }
+    }
     func onLazyVStackAppear(_ proxy: ScrollViewProxy) {
         if let tag = mangaDetail?.readingProgress {
             proxy.scrollTo(tag)
@@ -217,7 +234,7 @@ private extension ContentView {
     // MARK: ReadingProgress
     func calImageHeight(_ tag: Int) -> CGFloat {
         if let aspect = aspectBox[tag] {
-            return screenW * aspect
+            return absoluteScreenW * aspect
         } else {
             return screenH * contentHScale
         }
@@ -369,7 +386,7 @@ private struct ImageContainer: View {
                     percentage: percentage
                 )
                 .frame(
-                    width: screenW,
+                    width: absoluteScreenW,
                     height: screenH * contentHScale
                 )
             }