Minor fixes for dashboard
This commit is contained in:
@@ -26,7 +26,7 @@ public struct ConnectionListView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if !os(tvOS)
|
#if os(iOS)
|
||||||
.toolbar {
|
.toolbar {
|
||||||
ToolbarItemGroup(placement: .topBarTrailing) {
|
ToolbarItemGroup(placement: .topBarTrailing) {
|
||||||
Menu {
|
Menu {
|
||||||
|
|||||||
@@ -256,11 +256,13 @@ import SwiftUI
|
|||||||
}
|
}
|
||||||
#if os(tvOS)
|
#if os(tvOS)
|
||||||
StartStopButton()
|
StartStopButton()
|
||||||
#else
|
#elseif os(iOS)
|
||||||
if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
|
if #available(iOS 26.0, *), !Variant.debugNoIOS26 {
|
||||||
} else if !useLegacyTabView || coordinator.selection != .connections {
|
} else if !useLegacyTabView || coordinator.selection != .connections {
|
||||||
StartStopButton()
|
StartStopButton()
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
StartStopButton()
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -235,7 +235,7 @@ struct ProfilePickerSheet: View {
|
|||||||
macOSProfileRow(profile)
|
macOSProfileRow(profile)
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
.listRowInsets(EdgeInsets(top: 6, leading: 16, bottom: 6, trailing: 16))
|
.listRowInsets(EdgeInsets(top: 3, leading: 16, bottom: 3, trailing: 16))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.listStyle(.plain)
|
.listStyle(.plain)
|
||||||
@@ -260,7 +260,7 @@ struct ProfilePickerSheet: View {
|
|||||||
.environmentObject(environments)
|
.environmentObject(environments)
|
||||||
.listRowBackground(Color.clear)
|
.listRowBackground(Color.clear)
|
||||||
.listRowSeparator(.hidden)
|
.listRowSeparator(.hidden)
|
||||||
.listRowInsets(EdgeInsets(top: 4, leading: 16, bottom: 4, trailing: 16))
|
.listRowInsets(EdgeInsets(top: 2, leading: 16, bottom: 2, trailing: 16))
|
||||||
}
|
}
|
||||||
.onMove(perform: moveProfile)
|
.onMove(perform: moveProfile)
|
||||||
.onDelete(perform: deleteProfile)
|
.onDelete(perform: deleteProfile)
|
||||||
@@ -662,16 +662,6 @@ private struct ProfilePickerRow: View {
|
|||||||
|
|
||||||
private var macOSEditingBody: some View {
|
private var macOSEditingBody: some View {
|
||||||
rowContent
|
rowContent
|
||||||
.overlay(alignment: .trailing) {
|
|
||||||
Button {
|
|
||||||
onDelete()
|
|
||||||
} label: {
|
|
||||||
Image(systemName: "minus.circle.fill")
|
|
||||||
.font(.system(size: 20))
|
|
||||||
.foregroundStyle(.red)
|
|
||||||
}
|
|
||||||
.buttonStyle(.plain)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -729,9 +719,24 @@ private struct ProfilePickerRow: View {
|
|||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
|
|
||||||
|
#if os(macOS)
|
||||||
|
if isEditing {
|
||||||
|
Button {
|
||||||
|
onDelete()
|
||||||
|
} label: {
|
||||||
|
Image(systemName: "minus.circle.fill")
|
||||||
|
.font(.system(size: 20))
|
||||||
|
.foregroundStyle(.red)
|
||||||
|
}
|
||||||
|
.buttonStyle(.plain)
|
||||||
|
} else {
|
||||||
|
rowMenu
|
||||||
|
}
|
||||||
|
#else
|
||||||
if !isEditing {
|
if !isEditing {
|
||||||
rowMenu
|
rowMenu
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
.padding(16)
|
.padding(16)
|
||||||
|
|||||||
Reference in New Issue
Block a user