Commit d9bb755
committed
Centre the scrub pill, unblur it, and stop the readout acting as a pick target
- Centre the pill over the value row rather than left-aligning it. This
is safe now that it belongs to the row and is bounded by the row's
width; the earlier left-anchoring was working around it being centred
over a single field, which could push it past the swatch edge.
- Cancel the inherited text shadow on the pill. The swatch's content
carries one for legibility against any colour, but on the pill — which
already sits on an opaque capsule — it just read as blur.
- Shield the readout block from starting a screen pick. Clicking the
labels, the colour name, or the gaps between them fell through to
PickTarget and began a pick, which is easy to trigger by accident when
the same block is also where you click to edit and drag to scrub. The
shield is an NSView rather than a SwiftUI contentShape because
PickTarget is itself an NSView in the same z-order, so it has to win
AppKit's hit-testing, not just SwiftUI's. The value fields sit in front
and keep receiving their own clicks.
- Show a hairline in the swatch's UI colour on hover, so the boundary of
that non-picking region is discoverable rather than invisible.1 parent e3baaf4 commit d9bb755
2 files changed
Lines changed: 35 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
183 | 183 | | |
184 | 184 | | |
185 | 185 | | |
186 | | - | |
| 186 | + | |
187 | 187 | | |
188 | 188 | | |
189 | 189 | | |
| |||
196 | 196 | | |
197 | 197 | | |
198 | 198 | | |
199 | | - | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
200 | 203 | | |
201 | 204 | | |
202 | 205 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
66 | 66 | | |
67 | 67 | | |
68 | 68 | | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
69 | 85 | | |
70 | 86 | | |
71 | 87 | | |
| |||
87 | 103 | | |
88 | 104 | | |
89 | 105 | | |
| 106 | + | |
| 107 | + | |
90 | 108 | | |
91 | 109 | | |
92 | 110 | | |
| |||
170 | 188 | | |
171 | 189 | | |
172 | 190 | | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
173 | 203 | | |
174 | 204 | | |
175 | 205 | | |
| |||
0 commit comments