Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the overlapping scrollbars on the room list filters on macOS. #3646

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Fix the overlapping scrollbars on the room list filters on macOS. #3646

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion ElementX/Sources/Screens/HomeScreen/View/Filters/RoomListFiltersView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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)
}
}

Expand Down
Loading