[kevinepope]

Summary

Two new map styles beside Cushion and Flat: Bevel and City.

Bevel. Each file is an even fill with a two-pixel rim lightened along the top and left edges and darkened along the bottom and right, so it reads as lit from the upper left like the cushions but with hard edges. Small rectangles get a one-pixel rim, and anything under 3 px gets none.

• render/raster.rs: Shading::Bevel with paint_bevel, plus Shading::ALL, key, from_key and label helpers (mirroring Theme).
• Toolbar: the Cushions checkbox becomes a Cushion / Flat / Bevel segmented switch (same SHADING_ID).
• Menus: View ▸ Cushion Shading becomes a View ▸ Shading submenu with radio items; Command::ToggleCushions becomes Command::Shading(Shading) with ids view.shading.{cushion,flat,bevel}. The macOS menu bar follows through the shared spec.
• Settings: the style is stored as a shading key; cushions is still written so 0.1.1 reads the file unchanged, and old files with only cushions still load.
• Docs: CHANGELOG, PLAN §3.4 and the menu list, README feature line.

City (second commit). The map as a cityscape seen from above and a little to the lower right. Every painted rectangle is a building: its footprint is the rectangle less a one-pixel street on the right and bottom, widened by 1.5 px per enclosing folder that ends on that edge (so folders read as city blocks between avenues); its height is the cube root of its size relative to the biggest item in view, up to a tenth of the raster's shorter side (8–56 px), and flat under 2 px. Buildings are drawn in an oblique projection (roof moved up one pixel and left half a pixel per pixel of height, right wall at 0.7, bottom wall at 0.5) with a per-band depth buffer, so the parallel row bands stay independent of paint order.

• render/city.rs: Building, plan (footprints, streets, heights) and paint; raster.rs bins by the buildings' projected extents and allocates the depth buffer per band.
• Only the pixels are 3D: hit testing, hover and the outlines still use the footprint, so a tall roof is not clickable where it overhangs.
• Toolbar and View ▸ Shading gain a City entry; settings key cityscape.

Tests

• New rasteriser tests: bevel_mode_has_a_light_top_left_rim_and_a_dark_bottom_right_rim and tiny_bevelled_rectangles_get_a_thin_rim_or_none (pixel invariants, same style as the cushion and flat tests).
• City: a_cityscape_building_has_a_raised_roof_two_walls_and_a_street (one-file raster: roof offset, both walls, the street) and bigger_files_make_taller_buildings_and_streets_widen_at_folder_edges (cube-root heights, wider streets on folder edges, visible ground, nothing lit beyond a roof).
• Settings: round trip through Bevel, and the_shading_key_wins_over_the_old_cushions_flag.
• Menu, toolbar and native menu-bar tests updated for the three-way switch and submenu.
• cargo test --workspace, cargo clippy --workspace --all-targets -- -D warnings and cargo fmt are green on macOS (Apple Silicon).

Bevel and City on the laptop-ssd demo drive, light theme:

🤖 Generated with Claude Code