Skip to content

fix: ToolBar title not avoiding traffic lights when no sidebar is present #441

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 5, 2023
Merged

fix: ToolBar title not avoiding traffic lights when no sidebar is present #441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
368a19b
fix: `ToolBar` not avoiding traffic lights when no sidebar is present
GroovinChip Jul 4, 2023
fcd150c
tweak changelog
GroovinChip Jul 4, 2023
be20863
Merge branch 'dev' into title_bar_fix
GroovinChip Jul 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [2.0.0-beta.4]
🛠️ Fixed 🛠️
* `ToolBar`s in use where a `SideBar` is not present will now have their title's avoid the traffic lights (native window controls).

## [2.0.0-beta.3]
✨ New ✨
* Added support for `weekdayAbbreviations` and `monthAbbreviations` to `MacosDatePicker`.
Expand Down
2 changes: 1 addition & 1 deletion example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ packages:
path: ".."
relative: true
source: path
version: "2.0.0-beta.3"
version: "2.0.0-beta.4"
macos_window_utils:
dependency: transitive
description:
Expand Down
6 changes: 4 additions & 2 deletions lib/src/layout/window.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,10 @@ class _MacosWindowState extends State<MacosWindow> {
final height = constraints.maxHeight;
final isAtBreakpoint = width <= (sidebar?.windowBreakpoint ?? 0);
final isAtEndBreakpoint = width <= (endSidebar?.windowBreakpoint ?? 0);
final canShowSidebar = _showSidebar && !isAtBreakpoint;
final canShowEndSidebar = _showEndSidebar && !isAtEndBreakpoint;
final canShowSidebar =
_showSidebar && !isAtBreakpoint && sidebar != null;
final canShowEndSidebar =
_showEndSidebar && !isAtEndBreakpoint && endSidebar != null;
final visibleSidebarWidth = canShowSidebar ? _sidebarWidth : 0.0;
final visibleEndSidebarWidth =
canShowEndSidebar ? _endSidebarWidth : 0.0;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: macos_ui
description: Flutter widgets and themes implementing the current macOS design language.
version: 2.0.0-beta.3
version: 2.0.0-beta.4
homepage: "https://macosui.dev"
repository: "https://github.com/GroovinChip/macos_ui"

Expand Down