Skip to content

TP-26: Sync window chrome with active theme #152

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 3 commits into from
Jun 14, 2026
Merged

TP-26: Sync window chrome with active theme #152

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
12a4012
feat(theme): sync window chrome with QueryaThemeScope workbench tokens
ZhuchkaTriplesix Jun 14, 2026
1d69ec1
test(theme): cover window chrome styling from QueryaThemeScope
ZhuchkaTriplesix Jun 14, 2026
84a8e6a
fix: restore GestureDetector import and trim analyze warnings
ZhuchkaTriplesix Jun 14, 2026
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
192 changes: 6 additions & 186 deletions lib/features/main_screen/main_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@ import 'package:flutter/material.dart' as material
show
Scaffold,
Container,
MainAxisSize,
GestureDetector,
MouseRegion,
SystemMouseCursors,
HitTestBehavior,
Icons,
Icon,
BuildContext,
Widget,
RepaintBoundary;
Expand All @@ -20,11 +17,10 @@ import 'package:querya_desktop/core/theme/querya_theme_scope.dart';
import 'package:shadcn_flutter/shadcn_flutter.dart';
import 'package:querya_desktop/features/connections/connection_creation_flow.dart';
import 'package:querya_desktop/features/connections/connections_panel.dart';
import 'package:querya_desktop/features/main_screen/querya_window_title_bar.dart';
import 'package:querya_desktop/shared/widgets/widgets.dart';
import 'package:querya_desktop/features/mysql/mysql_object_kind.dart';
import 'package:querya_desktop/features/postgresql/postgres_object_kind.dart';
import 'package:querya_desktop/features/connections/driver_manager_dialog.dart';
import 'package:querya_desktop/features/settings/preferences_dialog.dart';
import 'main_screen_workspace_state.dart';
import 'workspace_panel.dart';

Expand Down Expand Up @@ -129,19 +125,18 @@ class _MainScreenState extends State<MainScreen> {

@override
material.Widget build(material.BuildContext context) {
final scheme = Theme.of(context).colorScheme;
final wb = context.workbench;
return material.Scaffold(
backgroundColor: scheme.background,
backgroundColor: wb.canvas,
body: WindowBorder(
color: scheme.border.withValues(alpha: 0.35),
color: wb.borderSubtle.withValues(alpha: 0.35),
width: 1,
child: Column(
children: [
_CustomTitleBar(
theme: scheme,
QueryaWindowTitleBar(
onNewDatabaseConnection: _onNewDatabaseConnectionFromMenu,
),
Divider(height: 1, color: scheme.border.withValues(alpha: 0.22)),
Divider(height: 1, color: wb.borderSubtle.withValues(alpha: 0.22)),
Expanded(
child: _MainContentSplit(
connectionsPanelKey: _connectionsPanelKey,
Expand Down Expand Up @@ -391,178 +386,3 @@ class _VerticalResizeHandle extends StatelessWidget {
);
}
}

class _CustomTitleBar extends StatefulWidget {
const _CustomTitleBar({
required this.theme,
required this.onNewDatabaseConnection,
});

final ColorScheme theme;
final Future<void> Function() onNewDatabaseConnection;

@override
State<_CustomTitleBar> createState() => _CustomTitleBarState();
}

class _CustomTitleBarState extends State<_CustomTitleBar> {
@override
material.Widget build(material.BuildContext context) {
final c = widget.theme;
final onDestructive = context.workbench.onAccent;
final buttonColors = WindowButtonColors(
iconNormal: c.mutedForeground,
mouseOver: c.muted.withValues(alpha: 0.5),
mouseDown: c.muted.withValues(alpha: 0.7),
iconMouseOver: c.foreground,
iconMouseDown: c.foreground,
);
final closeButtonColors = WindowButtonColors(
iconNormal: c.mutedForeground,
mouseOver: c.destructive,
mouseDown: c.destructive.withValues(alpha: 0.85),
iconMouseOver: onDestructive,
iconMouseDown: onDestructive,
);

return material.Container(
height: 40,
color: c.background,
child: WindowTitleBarBox(
child: Row(
children: [
Expanded(
child: MoveWindow(
child: Row(
children: [
const SizedBox(width: 16),
material.Icon(
material.Icons.search_rounded,
size: 18,
color: context.workbench.accent,
),
const Gap(8),
const Text('Querya').semiBold().small(),
const Gap(24),
Menubar(
border: false,
popoverOffset: const Offset(0, 8),
children: [
MenuButton(
subMenu: [
MenuButton(
onPressed: (_) {}, child: const Text('New')),
MenuButton(
onPressed: (_) {},
child: const Text('Open...')),
MenuButton(
onPressed: (_) {}, child: const Text('Save')),
const MenuDivider(),
MenuButton(
onPressed: (_) {}, child: const Text('Exit')),
],
child: const Text('File'),
),
MenuButton(
subMenu: [
MenuButton(
leading: const material.Icon(
material.Icons.tune_rounded,
size: 18,
),
onPressed: (ctx) => showPreferencesDialog(ctx),
child: const Text('Preferences…'),
),
],
child: const Text('Edit'),
),
MenuButton(
subMenu: [
MenuButton(
leading: const material.Icon(
material.Icons.add_link_rounded, size: 18),
trailing:
const Text('Shift+Ctrl+N').xSmall().muted(),
onPressed: (_) =>
widget.onNewDatabaseConnection(),
child: const Text('New Database Connection'),
),
MenuButton(
leading: const material.Icon(
material.Icons.link_rounded, size: 18),
onPressed: (_) {},
child: const Text('New Connection from URL'),
),
MenuButton(
leading: const material.Icon(
material.Icons.settings_rounded, size: 18),
onPressed: (ctx) => showDriverManagerDialog(ctx),
child: const Text('Driver Manager'),
),
const MenuDivider(),
MenuButton(
enabled: false,
leading: const material.Icon(
material.Icons.power_rounded, size: 18),
onPressed: (_) {},
child: const Text('Connect'),
),
MenuButton(
leading: const material.Icon(
material.Icons.refresh_rounded, size: 18),
onPressed: (_) {},
child: const Text('Invalidate/Reconnect'),
),
MenuButton(
leading: const material.Icon(
material.Icons.power_off_rounded, size: 18),
onPressed: (_) {},
child: const Text('Disconnect'),
),
MenuButton(
onPressed: (_) {},
child: const Text('Disconnect All')),
MenuButton(
onPressed: (_) {},
child: const Text('Disconnect Others')),
const MenuDivider(),
MenuButton(
leading: const material.Icon(
material.Icons.lock_outline_rounded,
size: 18),
onPressed: (_) {},
child: const Text('Read-only'),
),
],
child: const Text('Connection'),
),
MenuButton(
subMenu: [
MenuButton(
onPressed: (_) {}, child: const Text('About')),
MenuButton(
onPressed: (_) {},
child: const Text('Documentation')),
],
child: const Text('Help'),
),
],
),
],
),
),
),
Row(
mainAxisSize: material.MainAxisSize.min,
children: [
MinimizeWindowButton(colors: buttonColors),
MaximizeWindowButton(colors: buttonColors),
CloseWindowButton(colors: closeButtonColors),
],
)
],
),
),
);
}
}
Loading
Loading