[itsjavi]

Summary

Five Photoshop staples ported from upstream, each adapted where the backlog asked:

• Image › Image Rotation (90° clockwise, 90° counter clockwise, 180°), lossless, keeping effects, live text and shapes (TASK-14)
• Filter › Unsharp Mask and High Pass (TASK-15)
• Align and Distribute layers, measured by the pixels each layer shows rather than its box (TASK-16)
• Layer commands: Apply Layer Mask, Merge Visible, Flatten Image, Copy/Paste/Clear Layer Style, Show/Hide All Other Layers, and intersecting a layer's pixels or mask with the selection (TASK-17)
• Edit › Stroke along the selection's outline, on pixels or masks (by luminance) (TASK-19)

Each is one undo step. One commit per task, plus two small follow-ups (the Stroke sheet's slider ticks, and fitting Align and Distribute into the Move tool's bar) and the backlog records with screenshots.

Merge note: merge this after the upstream-fixes PR (TASK-8, effects dropped when a document is rebuilt from a snapshot). Rotation doesn't go through that rebuild (it turns the layers as they are), and a test checks that effects survive a turn, but TASK-14 depends on TASK-8 in the backlog.

Image › Image Rotation (TASK-14)

Ported from upstream PR robbietilton#195. Layer and mask pixels are turned whole with vImage, off the main thread, so nothing is resampled and four quarter turns give back the same bytes. The selection and guides turn too, and a quarter turn swaps the canvas's width and height. Live text and shapes keep their settings and turn by their angle, so they stay editable. Undo and redo of a size change now refit the view.

Rotation builds the turned document from the layers as they are, not from a project snapshot, so layer effects, text and shape settings carry over. Effects keep their angle, as Photoshop's Global Light does: a drop shadow still falls downward after the turn. New test: effectsLiveTextAndShapesSurviveATurn.

Filter › Unsharp Mask and High Pass (TASK-15)

Ported from upstream PR robbietilton#196 as-is. Unsharp Mask (Amount, Radius, Threshold) and High Pass (Radius) blur the layer with its edge held, then C kernels in AdjustPixels.c push each channel away from the blur, or keep only the detail around middle gray. They preview live in the existing filter panel and keep to the selection and the layer's size. The Filter menu lists them through FilterKind.allCases. New test: through the session with a selection, one undo step, same size and place, pixels outside the selection unchanged.

Align and Distribute (TASK-16)

Ported from upstream PR robbietilton#191, with one change. Upstream measured each layer's transform box, but Photoshop measures the pixels a layer shows, so a layer with transparent padding would line up by its padding. Each layer is now measured by its non-transparent pixels (brush_alpha_bounds), mapped through its transform, so flips and rotations count. A layer showing nothing is left alone. A hidden layer inside a selected folder moves with the folder but doesn't count toward its box. Moves are whole pixels.

Align works on edges or centers, against the selection, the canvas when one thing is selected, or the selected layers' combined box. Distribute works on centers or spacing, for three or more layers. Both are in the Layer menu (Align and Distribute submenus). In the Move tool's bar they're one pull-down, not upstream's ten icons: at a 1512 pt window (a 14" laptop) eight of the ten were scrolled out of sight past the bar's edge.

Layer commands (TASK-17)

Ported from commit aea6e20 of closed upstream PR robbietilton#163, taking only these commands. Ungroup Layers was already in the fork.

• Apply Layer Mask bakes an enabled mask into the layer's pixels at their own resolution. It isn't offered for folders, adjustments, live text or shapes.
• Merge Visible combines everything showing into one layer at the top of the visible stack and leaves hidden layers alone. It has no shortcut, because ⇧⌘E is Export PNG.
• Flatten Image combines everything showing into one "Background" layer and drops hidden layers.
• Copy, Paste and Clear Layer Style act on a layer's effects. The copied style is shared across the app, so it pastes into other documents too.
• Show/Hide All Other Layers solos a layer and keeps the folders around it showing.
• Intersect: a layer's pixels or mask can now be intersected with the selection, as well as added to or subtracted from it. Intersecting with nothing in common deselects.

All of these are in the Layer menu and in the Layers panel's right-click menu. A right-click on a thumbnail also offers Select / Add to / Subtract from / Intersect with Selection for its pixels or mask, and Cmd-Shift-Option-click on a thumbnail intersects, as in Photoshop. The original commit's separate menus for each part of a row are not ported; the fork keeps its one row menu and adds a selection section when the click lands on a thumbnail.

Edit › Stroke (TASK-19)

Ported from upstream PR robbietilton#190 (issue robbietilton#177). The sheet asks for width, foreground or background color, opacity, and Inside, Center or Outside, then draws a line along the selection's outline on the layer or its mask. The line isn't clipped to the selection, and only the tiles it crosses are touched. Upstream painted masks with the color's red channel; they now take its luminance (Rec. 709). The mask palette is black and white today, so nothing visible changes yet. Also dropped the Width slider's step, which on macOS drew a tick for every pixel under it (the binding already rounds).

Testing

All with swift build --disable-keychain --build-tests, then swift test --disable-keychain --skip-build --filter …:

• SharpenFilterTests: 5 passed (4 ported, 1 new)
• LayerAlignTests: 8 passed (5 ported, 3 new: padding and flips, empty layer, hidden layer in a folder)
• LayerCommandTests|LayerTests|LayerMaskTests: passed (ported tests plus new context-menu, thumbnail-menu and mask-intersect tests). The filter also matched TiledLayerTests, AdjustmentEditorTests and AdjustmentLayerTests.
• SelectionStrokeTests: 5 passed (3 ported, plus a mask stroke and luminance); SelectionEditTests (shares paintCanvas): 19 passed
• CanvasRotationTests: 5 passed (4 ported, 1 new); CanvasSizeTests|ImageSizeTests|HistoryTests (the restore change): 14 passed
• Final run of every touched suite, SharpenFilterTests|LayerAlignTests|LayerCommandTests|LayerTests|LayerMaskTests|SelectionStrokeTests|SelectionEditTests|CanvasRotationTests: 101 tests in 11 suites passed

The full suite was not run.

Screenshots

Document images were rendered offscreen through the app's export path, from sessions driven by the real commands (a throwaway test, not committed). Panels and sheets were rendered offscreen with NSHostingView. The Move tool bar shots are real windows: the baseline app built from main, and this branch's make dev build, each opened on the same fixture image. Fixtures are synthetic.

Image Rotation (TASK-14)

Fixture: a soft landscape, a card with Drop Shadow, an ellipse shape with Stroke, and live text "Rotate" with Stroke.

Before	After Image › Image Rotation › 90° Clockwise

After: the canvas is 400 × 600, the shadow still falls downward, and the text and shape keep their strokes and stay live.

Unsharp Mask and High Pass (TASK-15)

Before (soft landscape fixture)	After Unsharp Mask (180%, 2.5 px, 0 levels)	After High Pass (4 px)

Detail, 3× crop, before and after Unsharp Mask:

The Unsharp Mask panel (new; rendered offscreen during a live filter edit):

Align and Distribute (TASK-16)

Align Left Edges on three layers, each clear except for one shape placed off-center in its box. Dashed lines show each layer's bounds; the pink line marks the aligned edge.

Before	After Align › Left Edges

After: the shapes' left edges meet at x = 170 while their boxes don't. Measured by the transform box, as upstream did, the boxes would line up instead.

Move tool bar, real window with the fixture open. Before (main):

After (this branch): the Align and Distribute pull-down after Flip V:

Layer commands (TASK-17)

Layers panel (the real table, rendered offscreen) with a photo, Red, a hidden layer and Green.

Before	After Merge Visible	After Flatten Image (from the same start)

Merge Visible names the result after the topmost visible layer and leaves the hidden one alone; Flatten Image leaves one Background layer.

Edit › Stroke (TASK-19)

Before (elliptical selection drawn dashed)	After Edit › Stroke, 8 px, Center, foreground red

The Stroke sheet (new; rendered offscreen):

Manual checks still needed

Menus and sheets over a window can't be captured here:

• Image › Image Rotation submenu; run each turn on a real project, then undo
• Filter › Unsharp Mask… and High Pass…: open the panel, drag the sliders, check the live preview, OK and Cancel
• Layer › Align / Distribute submenus, and the Move tool bar's Align and Distribute pull-down (contents and enabled states)
• Layer menu: Apply Layer Mask, Merge Visible, Flatten Image, Layer Style ▸ Copy/Paste/Clear, Hide/Show All Other Layers
• Layers panel right-click on a row, on a layer thumbnail and on a mask thumbnail; Cmd-Shift-Option-click on a thumbnail to intersect
• Edit › Stroke…: open the sheet over the window, OK and Cancel, on pixels and with a mask targeted

---

Upstream (robbietilton/Compositor):

• Addresses Rotate canvas + image robbietilton/Compositor#212, porting Image › Image Rotation: 90° either way and 180° robbietilton/Compositor#195 by rezaularif
• Ports Filter › Unsharp Mask and High Pass robbietilton/Compositor#196 by rezaularif
• Ports Align and Distribute layers robbietilton/Compositor#191 by rezaularif, measuring visible pixels instead of the transform box
• Ports the layer commands from Photoshop parity: masks, Layers panel menus, Move bar modifiers, and tabs robbietilton/Compositor#163 (closed) by cheyras
• Addresses Feature request: Fill stroke with a color and a thickness robbietilton/Compositor#177, porting Edit › Stroke: a line along the selection's outline robbietilton/Compositor#190 by rezaularif