Disable scrolling fixes on macOS

treehollow · May 13, 2021 · daab7a1 · daab7a1
1 parent 97d9039
commit daab7a1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/Hollow/View/Hierarchy/Account/SettingsSubViews.swift b/Source/Hollow/View/Hierarchy/Account/SettingsSubViews.swift
@@ -521,6 +521,7 @@ struct OtherSettingsView: View {
 
                 }
 
+                #if !targetEnvironment(macCatalyst)
                 Section(footer: Text("SETTINGSVIEW_OTHER_EXP_FIX_SCROLL_FOOTER").padding(.horizontal)) {
                     HStack {
                         Text("SETTINGSVIEW_OTHER_EXP_FIX_SCROLL_LABEL")
@@ -531,6 +532,7 @@ struct OtherSettingsView: View {
                     }
 
                 }
+                #endif
 
             }
             .defaultListStyle()

diff --git a/Source/Hollow/View/Hierarchy/Hollow/Detail/HollowDetailView.swift b/Source/Hollow/View/Hierarchy/Hollow/Detail/HollowDetailView.swift
@@ -101,6 +101,10 @@ struct HollowDetailView: View {
                     LazyVStack(spacing: 0) {
                         content
                     }
+                    .padding([.horizontal, .bottom], UIDevice.isMac ? ViewConstants.macAdditionalPadding : 0)
+                    .padding(.top, UIDevice.isMac ? 10 : 0)
+                    .edgesIgnoringSafeArea(.bottom)
+
                     .onChange(of: store.replyToIndex) { index in
                         withAnimation(scrollAnimation) {
                             proxy.scrollTo(index, anchor: scrollToAnchor)
@@ -144,9 +148,6 @@ struct HollowDetailView: View {
 
         }
 
-        .padding([.horizontal, .bottom], UIDevice.isMac ? ViewConstants.macAdditionalPadding : 0)
-        .padding(.top, UIDevice.isMac ? 10 : 0)
-        .edgesIgnoringSafeArea(.bottom)
         .disabled(store.noSuchPost)
 
         .background(Color.hollowCardBackground.ignoresSafeArea())