Merge branch 'dev' into push_button_control_size

# Conflicts:
#	CHANGELOG.md

Author: GroovinChip

CHANGELOG.md

@@ -1,4 +1,4 @@
-## [2.0.0-beta.4]
+## [2.0.0-beta.5]
 🚨 Breaking Changes 🚨
 * `PushButton` has been updated to support the `ControlSize` enum.
   * The `buttonSize` property has been changed to `controlSize`.
@@ -8,6 +8,10 @@
 🔄 Updated 🔄
 * `PushButton`'s secondary and disabled colors more closely match their native counterparts. 
 
+## [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`.

example/pubspec.lock

@@ -97,7 +97,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "2.0.0-beta.4"
+    version: "2.0.0-beta.5"
   macos_window_utils:
     dependency: transitive
     description:

lib/src/layout/window.dart

@@ -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;

pubspec.yaml

@@ -1,6 +1,6 @@
 name: macos_ui
 description: Flutter widgets and themes implementing the current macOS design language.
-version: 2.0.0-beta.4
+version: 2.0.0-beta.5
 homepage: "https://macosui.dev"
 repository: "https://github.com/GroovinChip/macos_ui"