Skip to content

fix(macos): hide duplicate bitsdojo window buttons in title bar #513

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
ZhuchkaTriplesix merged 1 commit into from
Jul 28, 2026
Merged

fix(macos): hide duplicate bitsdojo window buttons in title bar #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions lib/features/main_screen/querya_window_title_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ class QueryaWindowTitleBar extends StatelessWidget {
return scale(isMacOS ? 72 : 16);
}

/// Bitsdojo chrome buttons duplicate system traffic lights on macOS.
@visibleForTesting
static bool showBitsdojoWindowButtons({required bool isMacOS}) => !isMacOS;

@visibleForTesting
static WindowButtonColors closeButtonColors(BuildContext context) {
final wb = context.workbench;
Expand Down Expand Up @@ -278,9 +282,13 @@ class QueryaWindowTitleBar extends StatelessWidget {
if (activeConnection != null && isReadOnly)
const QueryaReadOnlyBadge(),
UpdateAvailableBadge(controller: UpdateController.instance),
MinimizeWindowButton(colors: buttonColors),
MaximizeWindowButton(colors: buttonColors),
CloseWindowButton(colors: closeButtonColors),
if (QueryaWindowTitleBar.showBitsdojoWindowButtons(
isMacOS: Platform.isMacOS,
)) ...[
MinimizeWindowButton(colors: buttonColors),
MaximizeWindowButton(colors: buttonColors),
CloseWindowButton(colors: closeButtonColors),
],
],
)
],
Expand Down
11 changes: 11 additions & 0 deletions test/features/main_screen/querya_window_title_bar_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,17 @@ void main() {
);
});

test('bitsdojo window buttons hidden on macOS, shown elsewhere', () {
expect(
QueryaWindowTitleBar.showBitsdojoWindowButtons(isMacOS: true),
isFalse,
);
expect(
QueryaWindowTitleBar.showBitsdojoWindowButtons(isMacOS: false),
isTrue,
);
});

testWidgets('read-only state is persistently visible in title bar',
(tester) async {
await tester.pumpWidget(
Expand Down
Loading