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.

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

Adds margins to InfoPannel for older OS #544

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 2 additions & 10 deletions Xcodes/Frontend/InfoPane/InfoPane.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,8 @@ import struct XCModel.SDKs

struct InfoPane: View {
let xcode: Xcode
var body: some View {
if #available(macOS 14.0, *) {
mainContent
.contentMargins(10, for: .scrollContent)
} else {
mainContent
.padding()
}
}

private var mainContent: some View {
var body: some View {
ScrollView(.vertical) {
HStack(alignment: .top) {
VStack {
Expand Down Expand Up @@ -55,6 +46,7 @@ struct InfoPane: View {

}
}
.contentPadding(10)
}

@ViewBuilder
Expand Down
44 changes: 44 additions & 0 deletions Xcodes/Frontend/View+ContentPadding.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import SwiftUI

extension View {
@ViewBuilder
/// Adds an equal padding amount to specific edges of this view without clipping scrollable views.
/// - parameters:
/// - edges: Edges to add paddings
/// - length: The amount of padding to be added to edges.
/// - Returns: A view that’s padded by the specified amount on specified edges.
///
/// This modifier uses safe area as paddings, making both non-scrollable and scrollable content looks great in any context.
public func contentPadding(_ edges: Edge.Set = .all, _ length: CGFloat? = nil) -> some View {
if #available(macOS 14.0, *) {
safeAreaPadding(edges, length)
} else {
safeAreaInset(edge: .top) {
EmptyView().frame(width: 0, height: 0)
.padding(.top, edges.contains(.top) ? length : 0)
}
.safeAreaInset(edge: .bottom) {
EmptyView().frame(width: 0, height: 0)
.padding(.bottom, edges.contains(.bottom) ? length : 0)
}
.safeAreaInset(edge: .leading) {
EmptyView().frame(width: 0, height: 0)
.padding(.leading, edges.contains(.leading) ? length : 0)
}
.safeAreaInset(edge: .trailing) {
EmptyView().frame(width: 0, height: 0)
.padding(.trailing, edges.contains(.trailing) ? length : 0)
}
}
}

/// Adds an equal padding amount to all edges of this view without clipping scrollable views.
/// - parameters:
/// - length: The amount of padding to be added to edges.
/// - Returns: A view that’s padded by the specified amount on all edges.
///
/// This modifier uses safe area as paddings, making both non-scrollable and scrollable content looks great in any context.
public func contentPadding(_ length: CGFloat) -> some View {
contentPadding(.all, length)
}
}