Skip to content

feat(mapgen-studio): toolbar architecture v2 — top = Game bar, bottom = World/Map console with History affordance#1636

Merged
mateicanavra merged 1 commit into
mainfrom
design/toolbar-architecture-v2
Jun 12, 2026
Merged

feat(mapgen-studio): toolbar architecture v2 — top = Game bar, bottom = World/Map console with History affordance#1636
mateicanavra merged 1 commit into
mainfrom
design/toolbar-architecture-v2

Conversation

@mateicanavra

Copy link
Copy Markdown
Owner

Implements toolbar architecture v2 (Pass-5), regrounding the vertical zoning so the top bar is exclusively the Game toolbar and the bottom bar is exclusively the World/Map console.

Game bar (header)

  • Renames the center bar identity from "World" to "Game" (GlobeGamepad2).
  • Removes Size, Players, and Resources selects from the header entirely — no map settings in the top bar.
  • Composes GameConsole inline into the Game bar row rather than docking it as a separate panel beneath the bar; the component sheds its own panel chrome and "Civ7" identity label.
  • Collapses the setup disclosure to icon-only (SlidersHorizontal + chevron, no "Setup" text label), pinned last in the bar, expanding a game-setup-only row (Leader · Civ · Difficulty · Speed). Resources is removed from the setup dropdown.

World/Map console (footer)

  • Adds globalSettings/onGlobalSettingsChange props and renders Size, Players, and Resources selects left of the Seed input, so all map authoring lives in one place.
  • Replaces the inline last-run text cluster with a single History icon button: hover tooltip presents the last run (seed · size · players · resources), mirrored onto aria-label/title for accessibility, and click copies the last seed — preserving the behavior the old inline seed button carried.
  • The shared operation gate extends to the relocated selects: Size, Players, and Resources disable together with seed, reroll, auto-run, and Run while any studio or game operation is in flight.

Wiring

  • StudioShell reroutes WorldSettings props from the header to the footer.
  • Tests updated to assert map-setting controls in the footer, the History affordance's accessible name and tooltip content, and that the operation gate covers the relocated selects.

This was referenced Jun 12, 2026
@github-actions

Copy link
Copy Markdown

Railway preview (MapGen Studio): not provisioned for this PR.

Policy (Graphite stacks): previews are created only for the top-of-stack PR by default.

  • To force a preview for this PR: add label railway-preview
  • To suppress a preview: add label no-railway-preview

Debug: {"isClosed":false,"isFork":false,"suppress":false,"force":false,"isTopOfStack":false,"hasToken":true,"draft":false}

mateicanavra commented Jun 12, 2026

Copy link
Copy Markdown
Owner Author

Merge activity

  • Jun 12, 8:50 PM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Jun 12, 9:55 PM UTC: Graphite rebased this pull request as part of a merge.
  • Jun 12, 9:55 PM UTC: @mateicanavra merged this pull request with Graphite.

@mateicanavra
mateicanavra changed the base branch from design/pass5-frame to graphite-base/1636 June 12, 2026 21:52
@mateicanavra
mateicanavra changed the base branch from graphite-base/1636 to main June 12, 2026 21:53
@mateicanavra
mateicanavra force-pushed the design/toolbar-architecture-v2 branch from 66bd12d to f0a2eac Compare June 12, 2026 21:54
@mateicanavra
mateicanavra merged commit 0f728a2 into main Jun 12, 2026
This was referenced Jun 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant