Skip to content

Conversation

@zwaldowski
Copy link
Contributor

Adopts new APIs for the visual design where they make sense for macOS 11. It looks pretty spiffy.

This is the additional optimization mentioned in #715. It is separate from other open PRs and can be reviewed separately, although it will experience a trivial merge conflict if #714 is merged first.

The big change here is reworking the main toolbar to have a fixed layout. The map/commit/stashes control switches to show the up/down/close controls in a Quick View (rather than switching sides of the window), and the snapshots button and search bar disable instead of being hidden. For code complexity’s sake, this applies on 10.15 and below as well. The two-line window title remains as-is on 10.15 and below. This is definitely open to discussion, but it’s been working well for me in a week of daily use.

Additionally:

  • Uses appropriate symbols for the main window controls.
  • Restores window title using native window subtitle.
  • Uses a preference toolbar style with appropriate symbols for the preferences window.
  • Uses a more fitting button style for the stage/unstage button in the diff editor.
  • Configures destructive actions in alerts where applicable.
  • Updates some of the plumbing around validating the main window toolbar to better accomodate the fixed layout.

Aside: Titlebar Texture

When the content of a window scrolls and has no accessories, the titlebar background will disappear like navigation bars do on iOS. You can see this when the Finder is in View > As Icons; it’s a really nice effect. The map view is eligible for this by default, but other modes are not. Due to #94 creating the possibility for a weird appearance, this PR explicitly deactivates that so the titlebar background is the same in all modes. It’s not clear it would look good if #94 was fixed, anyway.

Screenshots

macOS 11 11.0 Map Light 11.0 Commit Light 11.0 Prefs Light 11.0 Map Dark 11.0 Commit Dark 11.0 Prefs Dark 11.0 Alert
macOS 10.15 10.15 Map Light 10.15 Commit Light 10.15 Prefs Light 10.15 Map Dark 10.15 Commit Dark 10.15 Prefs Dark
macOS 10.14 10.14 Map Light 10.14 Commit Light 10.14 Prefs Light 10.14 Map Dark 10.14 Commit Dark 10.14 Prefs Dark
macOS 10.13 10.13 Map 10.13 Commit 10.13 Prefs
macOS 10.12 10.12 Map 10.12 Commit 10.12 Prefs
macOS 10.11 10.11 Map 10.11 Commit 10.11 Prefs
macOS 10.10 10.10 Map 10.10 Commit 10.10 Prefs

I agree to the contributor agreement.

@lucasderraugh
Copy link
Collaborator

Damn, this looks incredible. Fantastic!

@lucasderraugh lucasderraugh merged commit 2474a4e into git-up:master Dec 4, 2020
@zwaldowski zwaldowski deleted the big-sur-toolbars branch December 5, 2020 16:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants