Pin view options button to leading toolbar edge on macOS

Place the view options control on the leading (`.navigation`) edge on
macOS so it is consistently the first/leftmost toolbar button across all
views, instead of sitting on the right next to the search field in
search views and on the left in non-search views.

Each affected view gains a computed `viewOptionsPlacement` (`.navigation`
on macOS, `.primaryAction` elsewhere) so iOS/iPadOS/tvOS keep the
button trailing. Search-style views (Search, InstanceBrowse) declare the
view options item first so it renders left of the search-filters button;
their flexible spacer is kept to right-pin the search field. Channel's
fixed spacer between view options and the channel menu is now iOS-only.
This commit is contained in:
Arkadiusz Fal
2026-06-14 16:03:10 +02:00
parent ad14c0129c
commit 77720ccea1
10 changed files with 139 additions and 41 deletions

View File

@@ -169,6 +169,15 @@ struct ManageChannelsView: View {
return result
}
/// View options button lives on the leading edge on macOS, trailing elsewhere.
private var viewOptionsPlacement: ToolbarItemPlacement {
#if os(macOS)
.navigation
#else
.primaryAction
#endif
}
var body: some View {
GeometryReader { geometry in
#if os(tvOS)
@@ -198,7 +207,7 @@ struct ManageChannelsView: View {
ToolbarSpacer(.flexible, placement: .primaryAction)
}
#endif
ToolbarItem(placement: .primaryAction) {
ToolbarItem(placement: viewOptionsPlacement) {
Button {
showViewOptions = true
} label: {

View File

@@ -318,6 +318,15 @@ struct SubscriptionsView: View {
return progress > 0 && progress < 1 ? progress : nil
}
/// View options button lives on the leading edge on macOS, trailing elsewhere.
private var viewOptionsPlacement: ToolbarItemPlacement {
#if os(macOS)
.navigation
#else
.primaryAction
#endif
}
var body: some View {
GeometryReader { geometry in
ScrollViewReader { proxy in
@@ -418,7 +427,7 @@ struct SubscriptionsView: View {
.toolbarTitleDisplayMode(.inlineLarge)
#endif
.toolbar {
ToolbarItem(placement: .primaryAction) {
ToolbarItem(placement: viewOptionsPlacement) {
Button {
showViewOptions = true
} label: {