Skip to content

fix(ios): build the edge-layout touch region from typed pieces #29

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

Merged
raiseCatError merged 1 commit into from
Oct 26, 2026
Merged

fix(ios): build the edge-layout touch region from typed pieces #29

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
12 changes: 7 additions & 5 deletions iOS/ReceiverControls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1364,6 +1364,12 @@ extension ReceiverControlOverlay {
.map { PadEdgeGeometry.circleRun(of: $0, metrics: metrics).insetBy(dx: -Self.trayPadding, dy: -Self.trayPadding) }
let occupied = layout.mainSegments.map(\.frame) + layout.functionSegments.map(\.frame)
+ [gearFrame, paletteFrame].compactMap { $0 }
// The touch region, built from typed pieces: as one `+`/`??` chain
// inside the ZStack it exceeded Xcode 26's type-checking budget.
let mainRegion: [CGRect] = autoHiding ? [] : mainControls.filter { !$0.kind.isOneTapAction }
.map { $0.frame.insetBy(dx: -4, dy: -4) }
let gearRegion: [CGRect] = gearFrame.map { [$0.insetBy(dx: -4, dy: -4)] } ?? []
let paletteRegion: [CGRect] = wheel.map { [$0.frame.insetBy(dx: -8, dy: -8)] } ?? paletteFrame.map { [$0] } ?? []

ZStack(alignment: .topLeading) {
ForEach(Array(layout.strips.enumerated()), id: \.offset) { _, strip in
Expand Down Expand Up @@ -1425,11 +1431,7 @@ extension ReceiverControlOverlay {
// outside this region and take their own taps.
Color.clear
.frame(width: containerSize.width, height: containerSize.height)
.contentShape(ControlRegionShape(
rects: (autoHiding ? [] : mainControls.filter { !$0.kind.isOneTapAction }
.map { $0.frame.insetBy(dx: -4, dy: -4) })
+ (gearFrame.map { [$0.insetBy(dx: -4, dy: -4)] } ?? [])
+ (wheel.map { [$0.frame.insetBy(dx: -8, dy: -8)] } ?? paletteFrame.map { [$0] } ?? [])))
.contentShape(ControlRegionShape(rects: mainRegion + gearRegion + paletteRegion))
.gesture(controlGesture())
}
.onAppear {
Expand Down
Loading