Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## [2.2.3]
### 🛠 Fixed 🛠
- Fixed sidebar background painting when wallpaper tinting is disabled: the macOS sidebar now stays transparent unless a decoration color is provided (previously showed a black strip). Addresses #587.

## [2.2.2]
### 🛠 Fixed 🛠
- Fixed setState called after dispose issue in MacosPulldownButton.
Expand Down
21 changes: 10 additions & 11 deletions lib/src/layout/window.dart
Original file line number Diff line number Diff line change
Expand Up @@ -195,18 +195,15 @@ class _MacosWindowState extends State<MacosWindow> {
}
final MacosThemeData theme = MacosTheme.of(context);
late Color backgroundColor = widget.backgroundColor ?? theme.canvasColor;
late Color sidebarBackgroundColor;
late Color? sidebarBackgroundColor;
late Color endSidebarBackgroundColor;
Color dividerColor = theme.dividerColor;

final isMac = !kIsWeb && defaultTargetPlatform == TargetPlatform.macOS;

// Respect the sidebar color override from parent if one is given
if (sidebar?.decoration?.color != null) {
sidebarBackgroundColor = sidebar!.decoration!.color!;
} else {
sidebarBackgroundColor = MacosColors.transparent;
}
sidebarBackgroundColor =
sidebar?.decoration?.color ?? (kIsWeb ? theme.canvasColor : null);

// Set the application window's brightness on macOS
MacOSBrightnessOverrideHandler.ensureMatchingBrightness(theme.brightness);
Expand Down Expand Up @@ -273,7 +270,7 @@ class _MacosWindowState extends State<MacosWindow> {
).normalize(),
child: kIsWeb
? ColoredBox(
color: theme.canvasColor,
color: sidebarBackgroundColor ?? theme.canvasColor,
child: Column(
children: [
// If an app is running on macOS, apply
Expand Down Expand Up @@ -326,10 +323,12 @@ class _MacosWindowState extends State<MacosWindow> {
: TransparentMacOSSidebar(
state: sidebarState,
child: DecoratedBox(
decoration: const BoxDecoration(
color: Color.fromRGBO(0, 0, 0, 1.0),
backgroundBlendMode: BlendMode.clear,
),
decoration:
(sidebar.decoration ?? const BoxDecoration())
.copyWith(
// Only paint if the caller set a color; null preserves native transparency.
color: sidebarBackgroundColor,
),
child: Column(
children: [
// If an app is running on macOS, apply
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
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.2.2
version: 2.2.3
homepage: "https://macosui.dev"
repository: "https://github.com/GroovinChip/macos_ui"

Expand Down