From a9fe7d287e4aff2bda86791ee5f7b07b2a287381 Mon Sep 17 00:00:00 2001 From: Doug <6060466+pixlwave@users.noreply.github.com> Date: Fri, 20 Dec 2024 13:54:41 +0000 Subject: [PATCH] Fix the overlapping scrollbars on macOS. (#3646) --- .../HomeScreen/View/Filters/RoomListFiltersView.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift index c801fc8cb..66c5fa87c 100644 --- a/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift +++ b/ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift @@ -12,6 +12,10 @@ struct RoomListFiltersView: View { @Binding var state: RoomListFiltersState @Namespace private var namespace + /// When you connect a mouse on macOS the scrollbars aren't hidden. This is some extra padding + /// applied to the scroll view content to make sure the bars don't overlap the filters. + private var macScrollBarPadding: CGFloat { ProcessInfo.processInfo.isiOSAppOnMac ? 16 : 0 } + var body: some View { ScrollViewReader { proxy in ScrollView(.horizontal) { @@ -39,11 +43,13 @@ struct RoomListFiltersView: View { .matchedGeometryEffect(id: filter.id, in: namespace) } } + .padding(.horizontal, 16) + .padding(.bottom, macScrollBarPadding) } } .scrollIndicators(.hidden) - .padding(.leading, 16) .padding(.vertical, 12) + .padding(.bottom, -macScrollBarPadding) } }