diff --git a/apps/flutter/.metadata b/apps/flutter/.metadata index 02c33e9..9b9642c 100644 --- a/apps/flutter/.metadata +++ b/apps/flutter/.metadata @@ -4,7 +4,7 @@ # This file should be version controlled and should not be manually edited. version: - revision: "db50e20168db8fee486b9abf32fc912de3bc5b6a" + revision: "ff37bef603469fb030f2b72995ab929ccfc227f0" channel: "stable" project_type: app @@ -13,11 +13,11 @@ project_type: app migration: platforms: - platform: root - create_revision: db50e20168db8fee486b9abf32fc912de3bc5b6a - base_revision: db50e20168db8fee486b9abf32fc912de3bc5b6a - - platform: linux - create_revision: db50e20168db8fee486b9abf32fc912de3bc5b6a - base_revision: db50e20168db8fee486b9abf32fc912de3bc5b6a + create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 + base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 + - platform: windows + create_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 + base_revision: ff37bef603469fb030f2b72995ab929ccfc227f0 # User provided section diff --git a/apps/flutter/lib/main.dart b/apps/flutter/lib/main.dart index af9e77b..86d663e 100644 --- a/apps/flutter/lib/main.dart +++ b/apps/flutter/lib/main.dart @@ -1,3 +1,4 @@ +import 'dart:io' show Platform; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:provider/provider.dart'; @@ -53,10 +54,47 @@ class BevyTasksApp extends StatelessWidget { } } -class AppShell extends StatelessWidget { +class AppShell extends StatefulWidget { const AppShell({super.key}); + @override + State createState() => _AppShellState(); +} + +class _AppShellState extends State with SingleTickerProviderStateMixin { static const _edge = 8.0; + late final AnimationController _settingsAnim; + late final Animation _settingsFade; + late final Animation _settingsScale; + bool _settingsVisible = false; + String? _prevScreen; + + @override + void initState() { + super.initState(); + _settingsAnim = AnimationController(vsync: this, duration: const Duration(milliseconds: 150)); + _settingsFade = CurvedAnimation(parent: _settingsAnim, curve: Curves.easeOut); + _settingsScale = Tween(begin: 0.95, end: 1.0) + .animate(CurvedAnimation(parent: _settingsAnim, curve: Curves.easeOut)); + } + + @override + void dispose() { + _settingsAnim.dispose(); + super.dispose(); + } + + void _onScreenChanged(String screen) { + if (screen == 'settings' && _prevScreen != 'settings') { + _settingsVisible = true; + _settingsAnim.forward(); + } else if (screen != 'settings' && _prevScreen == 'settings') { + _settingsAnim.reverse().then((_) { + if (mounted) setState(() => _settingsVisible = false); + }); + } + _prevScreen = screen; + } SystemMouseCursor _cursorFor(ResizeEdge? edge) => switch (edge) { ResizeEdge.top || ResizeEdge.bottom => SystemMouseCursors.resizeUpDown, @@ -70,6 +108,57 @@ class AppShell extends StatelessWidget { Widget build(BuildContext context) { final state = context.watch(); final isDark = Theme.of(context).brightness == Brightness.dark; + final hasNativeBorder = Platform.isWindows; + + _onScreenChanged(state.screen); + + Widget content = Stack( + children: [ + if (state.screen == 'setup') + const SetupScreen() + else + const TasksScreen(), + if (state.error != null) + Positioned( + top: 0, left: 0, right: 0, + child: Material( + color: AppTheme.danger, + child: Padding( + padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), + child: Row( + children: [ + Expanded( + child: Text(state.error!, style: const TextStyle(color: Colors.white, fontSize: 13)), + ), + GestureDetector( + onTap: state.clearError, + child: const Text('✕', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), + ), + ], + ), + ), + ), + ), + if (_settingsVisible) + FadeTransition( + opacity: _settingsFade, + child: ScaleTransition( + scale: _settingsScale, + child: const SettingsScreen(), + ), + ), + ], + ); + + if (hasNativeBorder) { + // Windows provides native border + shadow, just fill with surface color + return Scaffold( + backgroundColor: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, + body: ClipRect(child: content), + ); + } + + // Linux/macOS: custom border, shadow, and resize zones return Scaffold( backgroundColor: Colors.transparent, body: LayoutBuilder(builder: (context, constraints) { @@ -78,14 +167,10 @@ class AppShell extends StatelessWidget { hitTestBehavior: HitTestBehavior.translucent, child: Listener( behavior: HitTestBehavior.translucent, - onPointerHover: (event) { - // Update cursor based on edge proximity (handled by nested MouseRegion below) - }, + onPointerHover: (event) {}, child: Stack( children: [ - // Resize hit zones (in the 8px padding area) ..._buildResizeZones(constraints), - // Main content with padding Padding( padding: const EdgeInsets.all(_edge), child: Container( @@ -101,37 +186,7 @@ class AppShell extends StatelessWidget { ], ), clipBehavior: Clip.antiAlias, - child: Stack( - children: [ - if (state.screen == 'setup') - const SetupScreen() - else - const TasksScreen(), - if (state.error != null) - Positioned( - top: 0, left: 0, right: 0, - child: Material( - color: AppTheme.danger, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8), - child: Row( - children: [ - Expanded( - child: Text(state.error!, style: const TextStyle(color: Colors.white, fontSize: 13)), - ), - GestureDetector( - onTap: state.clearError, - child: const Text('✕', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold)), - ), - ], - ), - ), - ), - ), - if (state.screen == 'settings') - const SettingsScreen(), - ], - ), + child: content, ), ), ], diff --git a/apps/flutter/lib/src/screens/settings_screen.dart b/apps/flutter/lib/src/screens/settings_screen.dart index 20572c5..59ec686 100644 --- a/apps/flutter/lib/src/screens/settings_screen.dart +++ b/apps/flutter/lib/src/screens/settings_screen.dart @@ -22,7 +22,7 @@ class SettingsScreen extends StatelessWidget { onTap: () {}, child: AnimatedScale( scale: 1.0, - duration: const Duration(milliseconds: 200), + duration: const Duration(milliseconds: 150), curve: Curves.easeOut, child: Container( decoration: BoxDecoration( @@ -112,7 +112,7 @@ class SettingsScreen extends StatelessWidget { const Spacer(), // Toggle switch (matching Tauri: h-6 w-11) AnimatedContainer( - duration: const Duration(milliseconds: 200), + duration: const Duration(milliseconds: 150), width: 44, height: 24, decoration: BoxDecoration( @@ -120,7 +120,7 @@ class SettingsScreen extends StatelessWidget { color: state.darkMode ? AppTheme.primary : (isDark ? const Color(0xFF4B5563) : const Color(0xFFD1D5DB)), ), child: AnimatedAlign( - duration: const Duration(milliseconds: 200), + duration: const Duration(milliseconds: 150), alignment: state.darkMode ? Alignment.centerRight : Alignment.centerLeft, child: Container( width: 20, diff --git a/apps/flutter/lib/src/screens/tasks_screen.dart b/apps/flutter/lib/src/screens/tasks_screen.dart index 56dbe43..b926746 100644 --- a/apps/flutter/lib/src/screens/tasks_screen.dart +++ b/apps/flutter/lib/src/screens/tasks_screen.dart @@ -15,7 +15,7 @@ class TasksScreen extends StatefulWidget { State createState() => _TasksScreenState(); } -class _TasksScreenState extends State { +class _TasksScreenState extends State with SingleTickerProviderStateMixin { bool _drawerOpen = false; bool _showCompleted = false; bool _completedVisible = false; @@ -24,9 +24,22 @@ class _TasksScreenState extends State { bool _newTaskOpen = false; final _newListController = TextEditingController(); final _newListFocus = FocusNode(); + late final AnimationController _newTaskAnim; + late final Animation _newTaskSlide; + late final Animation _newTaskFade; + + @override + void initState() { + super.initState(); + _newTaskAnim = AnimationController(vsync: this, duration: const Duration(milliseconds: 150)); + _newTaskSlide = Tween(begin: const Offset(0, 1), end: Offset.zero) + .animate(CurvedAnimation(parent: _newTaskAnim, curve: Curves.easeOut)); + _newTaskFade = CurvedAnimation(parent: _newTaskAnim, curve: Curves.easeOut); + } @override void dispose() { + _newTaskAnim.dispose(); _newListController.dispose(); _newListFocus.dispose(); super.dispose(); @@ -47,10 +60,13 @@ class _TasksScreenState extends State { final state = context.read(); if (state.activeListId == null) return; setState(() => _newTaskOpen = true); + _newTaskAnim.forward(); } void _closeNewTask() { - setState(() => _newTaskOpen = false); + _newTaskAnim.reverse().then((_) { + if (mounted) setState(() => _newTaskOpen = false); + }); } Future _handleCreateTask(String title, String desc, {String? dueDate}) async { @@ -94,21 +110,29 @@ class _TasksScreenState extends State { clipBehavior: Clip.hardEdge, children: [ // Sliding container: drawer + main + detail - AnimatedPositioned( - duration: const Duration(milliseconds: 250), - curve: Curves.easeOut, - left: _drawerOpen ? 0.0 : -drawerWidth, - top: 0, - bottom: 0, - width: drawerWidth + width, - child: Row( - children: [ - SizedBox(width: drawerWidth, child: _buildDrawer(state, isDark)), - SizedBox( - width: width, - child: _buildMainWithDetail(state, isDark, width), + Positioned.fill( + child: ClipRect( + child: OverflowBox( + maxWidth: drawerWidth + width, + alignment: Alignment.centerLeft, + child: AnimatedSlide( + duration: const Duration(milliseconds: 150), + curve: Curves.easeOut, + offset: _drawerOpen ? Offset.zero : Offset(-drawerWidth / (drawerWidth + width), 0), + child: SizedBox( + width: drawerWidth + width, + child: Row( + children: [ + SizedBox(width: drawerWidth, child: _buildDrawer(state, isDark)), + SizedBox( + width: width, + child: _buildMainWithDetail(state, isDark, width), + ), + ], + ), + ), ), - ], + ), ), ), // FAB button (centered, 56px, hidden when drawer/detail/newTask open) @@ -133,13 +157,10 @@ class _TasksScreenState extends State { ), ), // New task overlay (animated, inside app bounds) - Positioned.fill( - child: IgnorePointer( - ignoring: !_newTaskOpen, - child: AnimatedOpacity( - duration: const Duration(milliseconds: 250), - curve: Curves.easeOut, - opacity: _newTaskOpen ? 1.0 : 0.0, + if (_newTaskOpen || _newTaskAnim.isAnimating) + Positioned.fill( + child: FadeTransition( + opacity: _newTaskFade, child: GestureDetector( onTap: _closeNewTask, child: Container( @@ -147,15 +168,15 @@ class _TasksScreenState extends State { alignment: Alignment.bottomCenter, child: GestureDetector( onTap: () {}, - child: _newTaskOpen - ? NewTaskInput(onCreate: _handleCreateTask) - : const SizedBox.shrink(), + child: SlideTransition( + position: _newTaskSlide, + child: NewTaskInput(onCreate: _handleCreateTask), + ), ), ), ), ), ), - ), ], ); }); @@ -170,49 +191,67 @@ class _TasksScreenState extends State { child: OverflowBox( maxWidth: totalWidth * 2, alignment: Alignment.centerLeft, - child: AnimatedContainer( - duration: const Duration(milliseconds: 250), + child: AnimatedSlide( + duration: const Duration(milliseconds: 150), curve: Curves.easeOut, - transform: Matrix4.translationValues(hasDetail ? -totalWidth : 0, 0, 0), - width: totalWidth * 2, - child: Row( - children: [ - SizedBox(width: totalWidth, child: _buildMain(state, isDark)), - SizedBox( - width: totalWidth, - child: Container( - color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, - child: hasDetail - ? TaskDetailView(task: state.selectedTask!) - : const SizedBox.shrink(), + offset: hasDetail ? const Offset(-0.5, 0) : Offset.zero, + child: SizedBox( + width: totalWidth * 2, + child: Row( + children: [ + SizedBox(width: totalWidth, child: _buildMain(state, isDark)), + SizedBox( + width: totalWidth, + child: Container( + color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, + child: hasDetail + ? TaskDetailView(task: state.selectedTask!) + : const SizedBox.shrink(), + ), ), - ), - ], + ], + ), ), ), ), ), - // Dim overlay when drawer is open (animated fade) + // Drawer shadow (narrow element at left edge casting right) + Positioned( + left: 0, + top: 0, + bottom: 0, + width: 1, + child: IgnorePointer( + child: AnimatedOpacity( + duration: const Duration(milliseconds: 150), + curve: Curves.easeOut, + opacity: _drawerOpen ? 1.0 : 0.0, + child: Container( + decoration: BoxDecoration( + boxShadow: [ + BoxShadow( + color: Colors.black.withValues(alpha: 0.4), + blurRadius: 16, + offset: const Offset(4, 0), + ), + ], + ), + ), + ), + ), + ), + // Dim overlay when drawer is open Positioned.fill( child: IgnorePointer( ignoring: !_drawerOpen, child: GestureDetector( onTap: _closeDrawer, child: AnimatedOpacity( - duration: const Duration(milliseconds: 250), + duration: const Duration(milliseconds: 150), curve: Curves.easeOut, opacity: _drawerOpen ? 1.0 : 0.0, child: Container( - decoration: BoxDecoration( - color: Colors.black.withValues(alpha: 0.4), - boxShadow: [ - BoxShadow( - color: Colors.black.withValues(alpha: 0.4), - blurRadius: 24, - offset: const Offset(8, 0), - ), - ], - ), + color: Colors.black.withValues(alpha: 0.4), ), ), ), @@ -225,137 +264,59 @@ class _TasksScreenState extends State { Widget _buildDrawer(AppState state, bool isDark) { return Container( color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, - child: Column( + child: Stack( children: [ - // Header: workspace switcher (matching Tauri) - GestureDetector( - onPanStart: (_) {}, - child: Container( - height: 44, - padding: const EdgeInsets.symmetric(horizontal: 12), - decoration: BoxDecoration( - border: Border( - bottom: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5), - ), - ), - child: Row( - children: [ - Expanded( - child: GestureDetector( - onTap: () => setState(() => _workspaceSwitcherOpen = !_workspaceSwitcherOpen), - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(8), - ), - child: Row( - mainAxisSize: MainAxisSize.min, - children: [ - Flexible( - child: Text( - state.config?.currentWorkspace ?? 'Workspace', - style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600), - overflow: TextOverflow.ellipsis, - ), - ), - const SizedBox(width: 6), - AnimatedRotation( - turns: _workspaceSwitcherOpen ? 0.5 : 0, - duration: const Duration(milliseconds: 200), - child: Icon(Icons.expand_more, size: 14, - color: isDark ? AppTheme.textDark : AppTheme.textLight), - ), - ], - ), - ), + Column( + children: [ + // Header: workspace switcher + GestureDetector( + onPanStart: (_) {}, + child: Container( + height: 44, + padding: const EdgeInsets.symmetric(horizontal: 12), + decoration: BoxDecoration( + border: Border( + bottom: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5), ), ), - ], - ), - ), - ), - // Workspace dropdown (appears below header) - if (_workspaceSwitcherOpen && state.config != null) - Container( - constraints: const BoxConstraints(maxHeight: 200), - decoration: BoxDecoration( - color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, - border: Border( - bottom: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5), - ), - boxShadow: [ - BoxShadow(color: Colors.black.withValues(alpha: 0.1), blurRadius: 8, offset: const Offset(0, 2)), - ], - ), - child: ListView( - shrinkWrap: true, - padding: const EdgeInsets.symmetric(vertical: 4), - children: [ - for (final ws in state.config!.workspaces) - GestureDetector( - onTap: () { - state.switchWorkspace(ws.name); - setState(() => _workspaceSwitcherOpen = false); - }, - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 4), - child: Container( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6), - decoration: BoxDecoration( - borderRadius: BorderRadius.circular(4), - ), - child: Row( - children: [ - if (ws.name == state.config?.currentWorkspace) - Padding( - padding: const EdgeInsets.only(right: 8), - child: Icon(Icons.check, size: 16, - color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5)), + child: Row( + children: [ + Expanded( + child: GestureDetector( + onTap: () => setState(() => _workspaceSwitcherOpen = !_workspaceSwitcherOpen), + child: Container( + padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4), + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Flexible( + child: Text( + state.config?.currentWorkspace ?? 'Workspace', + style: const TextStyle(fontSize: 14, fontWeight: FontWeight.w600), + overflow: TextOverflow.ellipsis, + ), ), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text(ws.name, - style: TextStyle(fontSize: 14, - fontWeight: ws.name == state.config?.currentWorkspace ? FontWeight.w700 : FontWeight.normal), - overflow: TextOverflow.ellipsis), - Text(ws.path, - style: TextStyle(fontSize: 12, - color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.4)), - overflow: TextOverflow.ellipsis), - ], + const SizedBox(width: 6), + AnimatedRotation( + turns: _workspaceSwitcherOpen ? 0.5 : 0, + duration: const Duration(milliseconds: 150), + child: Icon(Icons.expand_more, size: 14, + color: isDark ? AppTheme.textDark : AppTheme.textLight), ), - ), - ], + ], + ), ), ), ), - ), - // Add workspace - Container( - margin: const EdgeInsets.only(top: 4), - decoration: BoxDecoration( - border: Border(top: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5)), - ), - padding: const EdgeInsets.symmetric(horizontal: 4, vertical: 4), - child: GestureDetector( - onTap: () { - setState(() => _workspaceSwitcherOpen = false); - state.setScreen('setup'); - }, - child: Padding( - padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 6), - child: Text('+ Add workspace', - style: TextStyle(fontSize: 14, color: AppTheme.primary)), - ), - ), + ], ), - ], + ), ), - ), - // List items - Expanded( + // List items + Expanded( child: ListView( padding: const EdgeInsets.symmetric(vertical: 8), children: [ @@ -428,22 +389,95 @@ class _TasksScreenState extends State { ], ), ), - // Footer: Settings button (matching Tauri) - GestureDetector( - onTap: () => state.setScreen('settings'), - child: Container( - decoration: BoxDecoration( - border: Border(top: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5)), + // Footer: Settings button (matching Tauri) + GestureDetector( + onTap: () => state.setScreen('settings'), + child: Container( + decoration: BoxDecoration( + border: Border(top: BorderSide(color: isDark ? AppTheme.borderDark : AppTheme.borderLight, width: 0.5)), + ), + padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), + child: Row( + children: [ + Icon(Icons.settings, size: 18, + color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5)), + const SizedBox(width: 8), + Text('Settings', style: TextStyle(fontSize: 14, + color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5))), + ], + ), ), - padding: const EdgeInsets.symmetric(horizontal: 20, vertical: 12), - child: Row( - children: [ - Icon(Icons.settings, size: 18, - color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5)), - const SizedBox(width: 8), - Text('Settings', style: TextStyle(fontSize: 14, - color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5))), - ], + ), + ], + ), + // Workspace switcher popup backdrop + if (_workspaceSwitcherOpen) + Positioned.fill( + child: GestureDetector( + onTap: () => setState(() => _workspaceSwitcherOpen = false), + behavior: HitTestBehavior.opaque, + child: const SizedBox.expand(), + ), + ), + // Workspace switcher popup menu + Positioned( + left: 8, + right: 8, + top: 48, + child: AnimatedScale( + scale: _workspaceSwitcherOpen ? 1.0 : 0.9, + duration: const Duration(milliseconds: 150), + curve: Curves.easeOut, + alignment: Alignment.topLeft, + child: AnimatedOpacity( + opacity: _workspaceSwitcherOpen ? 1.0 : 0.0, + duration: const Duration(milliseconds: 150), + curve: Curves.easeOut, + child: IgnorePointer( + ignoring: !_workspaceSwitcherOpen, + child: Container( + constraints: const BoxConstraints(maxHeight: 200), + decoration: BoxDecoration( + color: isDark ? AppTheme.cardDark : AppTheme.surfaceLight, + borderRadius: BorderRadius.circular(8), + boxShadow: [ + BoxShadow(color: Colors.black.withValues(alpha: 0.2), blurRadius: 12, offset: const Offset(0, 4)), + ], + ), + clipBehavior: Clip.antiAlias, + child: state.config != null + ? ListView( + shrinkWrap: true, + padding: const EdgeInsets.symmetric(vertical: 4), + children: [ + for (final ws in state.config!.workspaces) + _WorkspaceMenuItem( + name: ws.name, + path: ws.path, + isActive: ws.name == state.config?.currentWorkspace, + onTap: () { + state.switchWorkspace(ws.name); + setState(() => _workspaceSwitcherOpen = false); + }, + ), + // Add workspace + _WorkspaceMenuItem( + icon: null, + name: '+ Add workspace', + path: null, + isActive: false, + isAccent: true, + showDivider: true, + onTap: () { + setState(() => _workspaceSwitcherOpen = false); + state.setScreen('setup'); + }, + ), + ], + ) + : const SizedBox.shrink(), + ), + ), ), ), ), @@ -549,7 +583,7 @@ class _TasksScreenState extends State { setState(() { if (_showCompleted) { _showCompleted = false; - Future.delayed(const Duration(milliseconds: 300), () { + Future.delayed(const Duration(milliseconds: 150), () { if (mounted) setState(() => _completedVisible = false); }); } else { @@ -580,7 +614,7 @@ class _TasksScreenState extends State { ), AnimatedRotation( turns: _showCompleted ? 0.25 : 0, - duration: const Duration(milliseconds: 200), + duration: const Duration(milliseconds: 150), child: Icon(Icons.chevron_right, size: 16, color: isDark ? AppTheme.textSecondaryDark : AppTheme.textSecondaryLight), ), @@ -590,10 +624,10 @@ class _TasksScreenState extends State { ), if (_completedVisible) AnimatedOpacity( - duration: const Duration(milliseconds: 300), + duration: const Duration(milliseconds: 150), opacity: _showCompleted ? 1.0 : 0.0, child: AnimatedSlide( - duration: const Duration(milliseconds: 300), + duration: const Duration(milliseconds: 150), offset: _showCompleted ? Offset.zero : const Offset(0, -0.05), child: Column( children: [ @@ -681,3 +715,84 @@ class _ListTileState extends State<_ListTile> { ); } } + +class _WorkspaceMenuItem extends StatefulWidget { + final String name; + final String? path; + final bool isActive; + final bool isAccent; + final bool showDivider; + final IconData? icon; + final VoidCallback onTap; + + const _WorkspaceMenuItem({ + required this.name, + this.path, + required this.isActive, + this.isAccent = false, + this.showDivider = false, + this.icon, + required this.onTap, + }); + + @override + State<_WorkspaceMenuItem> createState() => _WorkspaceMenuItemState(); +} + +class _WorkspaceMenuItemState extends State<_WorkspaceMenuItem> { + bool _hovering = false; + + @override + Widget build(BuildContext context) { + final isDark = Theme.of(context).brightness == Brightness.dark; + return Column( + mainAxisSize: MainAxisSize.min, + children: [ + if (widget.showDivider) + Divider(height: 1, thickness: 0.5, color: isDark ? AppTheme.borderDark : AppTheme.borderLight), + MouseRegion( + onEnter: (_) => setState(() => _hovering = true), + onExit: (_) => setState(() => _hovering = false), + child: GestureDetector( + onTap: widget.onTap, + child: Container( + color: _hovering + ? (isDark ? Colors.white.withValues(alpha: 0.1) : Colors.black.withValues(alpha: 0.05)) + : Colors.transparent, + padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 6), + child: Row( + children: [ + if (widget.isActive) + Padding( + padding: const EdgeInsets.only(right: 8), + child: Icon(Icons.check, size: 16, + color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5)), + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(widget.name, + style: TextStyle( + fontSize: 14, + fontWeight: widget.isActive ? FontWeight.w700 : FontWeight.normal, + color: widget.isAccent ? AppTheme.primary : null, + ), + overflow: TextOverflow.ellipsis), + if (widget.path != null) + Text(widget.path!, + style: TextStyle(fontSize: 12, + color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.4)), + overflow: TextOverflow.ellipsis), + ], + ), + ), + ], + ), + ), + ), + ), + ], + ); + } +} diff --git a/apps/flutter/lib/src/widgets/task_detail_view.dart b/apps/flutter/lib/src/widgets/task_detail_view.dart index 43940be..a8d51a9 100644 --- a/apps/flutter/lib/src/widgets/task_detail_view.dart +++ b/apps/flutter/lib/src/widgets/task_detail_view.dart @@ -16,17 +16,24 @@ class TaskDetailView extends StatefulWidget { State createState() => _TaskDetailViewState(); } -class _TaskDetailViewState extends State { +class _TaskDetailViewState extends State with SingleTickerProviderStateMixin { late TextEditingController _titleController; late TextEditingController _descController; Timer? _debounce; bool _showMenu = false; + late final AnimationController _menuAnim; + late final Animation _menuFade; + late final Animation _menuScale; @override void initState() { super.initState(); _titleController = TextEditingController(text: widget.task.title); _descController = TextEditingController(text: widget.task.description); + _menuAnim = AnimationController(vsync: this, duration: const Duration(milliseconds: 150)); + _menuFade = CurvedAnimation(parent: _menuAnim, curve: Curves.easeOut); + _menuScale = Tween(begin: 0.9, end: 1.0) + .animate(CurvedAnimation(parent: _menuAnim, curve: Curves.easeOut)); } @override @@ -42,6 +49,7 @@ class _TaskDetailViewState extends State { @override void dispose() { _debounce?.cancel(); + _menuAnim.dispose(); _titleController.dispose(); _descController.dispose(); super.dispose(); @@ -245,7 +253,11 @@ class _TaskDetailViewState extends State { if (_showMenu) Positioned.fill( child: GestureDetector( - onTap: () => setState(() => _showMenu = false), + onTap: () { + _menuAnim.reverse().then((_) { + if (mounted) setState(() => _showMenu = false); + }); + }, behavior: HitTestBehavior.opaque, child: const SizedBox.expand(), ), @@ -259,52 +271,68 @@ class _TaskDetailViewState extends State { mainAxisSize: MainAxisSize.min, children: [ GestureDetector( - onTap: () => setState(() => _showMenu = !_showMenu), + onTap: () { + setState(() => _showMenu = !_showMenu); + if (_showMenu) _menuAnim.forward(); else _menuAnim.reverse(); + }, child: Padding( padding: const EdgeInsets.all(6), child: Icon(Icons.more_vert, size: 20, color: (isDark ? AppTheme.textDark : AppTheme.textLight).withValues(alpha: 0.5)), ), ), - if (_showMenu) - Container( - margin: const EdgeInsets.only(top: 4), - constraints: const BoxConstraints(minWidth: 200), - decoration: BoxDecoration( - color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, - borderRadius: BorderRadius.circular(8), - border: Border.all(color: isDark ? AppTheme.borderDark : AppTheme.borderLight), - boxShadow: [ - BoxShadow(color: Colors.black.withValues(alpha: 0.15), blurRadius: 8, offset: const Offset(0, 2)), - ], - ), - child: ClipRRect( - borderRadius: BorderRadius.circular(8), - child: Column( - mainAxisSize: MainAxisSize.min, - children: [ - _KebabMenuItem( - icon: isCompleted ? Icons.close : Icons.check, - label: isCompleted ? 'Restore task' : 'Mark as completed', - onTap: () { - setState(() => _showMenu = false); - state.toggleTask(widget.task.id); - state.selectTask(null); - }, + ScaleTransition( + scale: _menuScale, + alignment: Alignment.topRight, + child: FadeTransition( + opacity: _menuFade, + child: IgnorePointer( + ignoring: !_showMenu, + child: Container( + margin: const EdgeInsets.only(top: 4), + width: 200, + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(8), + border: Border.all(color: isDark ? AppTheme.borderDark : AppTheme.borderLight), + boxShadow: [ + BoxShadow(color: Colors.black.withValues(alpha: 0.15), blurRadius: 8, offset: const Offset(0, 2)), + ], + ), + child: Container( + decoration: BoxDecoration( + color: isDark ? AppTheme.surfaceDark : AppTheme.surfaceLight, + borderRadius: BorderRadius.circular(7), ), - _KebabMenuItem( - icon: Icons.delete_outline, - label: 'Delete', - color: AppTheme.danger, - onTap: () { - setState(() => _showMenu = false); - state.deleteTask(widget.task.id); - }, + clipBehavior: Clip.antiAlias, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + _KebabMenuItem( + icon: isCompleted ? Icons.close : Icons.check, + label: isCompleted ? 'Restore task' : 'Mark as completed', + onTap: () { + setState(() => _showMenu = false); + state.toggleTask(widget.task.id); + state.selectTask(null); + }, + ), + _KebabMenuItem( + icon: Icons.delete_outline, + label: 'Delete', + color: AppTheme.danger, + onTap: () { + setState(() => _showMenu = false); + state.deleteTask(widget.task.id); + }, + ), + ], ), - ], + ), ), ), ), + ), ], ), ), diff --git a/apps/flutter/pubspec.lock b/apps/flutter/pubspec.lock index d052664..136587f 100644 --- a/apps/flutter/pubspec.lock +++ b/apps/flutter/pubspec.lock @@ -534,5 +534,5 @@ packages: source: hosted version: "3.1.3" sdks: - dart: ">=3.11.4 <4.0.0" + dart: ">=3.11.1 <4.0.0" flutter: ">=3.38.4" diff --git a/apps/flutter/pubspec.yaml b/apps/flutter/pubspec.yaml index 8adaae7..5f95f96 100644 --- a/apps/flutter/pubspec.yaml +++ b/apps/flutter/pubspec.yaml @@ -4,7 +4,7 @@ publish_to: 'none' version: 1.0.0+1 environment: - sdk: ^3.11.4 + sdk: ^3.11.1 dependencies: flutter: diff --git a/apps/flutter/test/widget_test.dart b/apps/flutter/test/widget_test.dart new file mode 100644 index 0000000..470d712 --- /dev/null +++ b/apps/flutter/test/widget_test.dart @@ -0,0 +1,30 @@ +// This is a basic Flutter widget test. +// +// To perform an interaction with a widget in your test, use the WidgetTester +// utility in the flutter_test package. For example, you can send tap and scroll +// gestures. You can also use WidgetTester to find child widgets in the widget +// tree, read text, and verify that the values of widget properties are correct. + +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +import 'package:bevy_tasks/main.dart'; + +void main() { + testWidgets('Counter increments smoke test', (WidgetTester tester) async { + // Build our app and trigger a frame. + await tester.pumpWidget(const MyApp()); + + // Verify that our counter starts at 0. + expect(find.text('0'), findsOneWidget); + expect(find.text('1'), findsNothing); + + // Tap the '+' icon and trigger a frame. + await tester.tap(find.byIcon(Icons.add)); + await tester.pump(); + + // Verify that our counter has incremented. + expect(find.text('0'), findsNothing); + expect(find.text('1'), findsOneWidget); + }); +} diff --git a/apps/flutter/windows/.gitignore b/apps/flutter/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/apps/flutter/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/apps/flutter/windows/CMakeLists.txt b/apps/flutter/windows/CMakeLists.txt new file mode 100644 index 0000000..86a0586 --- /dev/null +++ b/apps/flutter/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(bevy_tasks LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "bevy_tasks") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/apps/flutter/windows/flutter/CMakeLists.txt b/apps/flutter/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/apps/flutter/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/apps/flutter/windows/flutter/generated_plugin_registrant.cc b/apps/flutter/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..c6fe39a --- /dev/null +++ b/apps/flutter/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,17 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + ScreenRetrieverWindowsPluginCApiRegisterWithRegistrar( + registry->GetRegistrarForPlugin("ScreenRetrieverWindowsPluginCApi")); + WindowManagerPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("WindowManagerPlugin")); +} diff --git a/apps/flutter/windows/flutter/generated_plugin_registrant.h b/apps/flutter/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/apps/flutter/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/apps/flutter/windows/flutter/generated_plugins.cmake b/apps/flutter/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..5e3bc3d --- /dev/null +++ b/apps/flutter/windows/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + screen_retriever_windows + window_manager +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/apps/flutter/windows/runner/CMakeLists.txt b/apps/flutter/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/apps/flutter/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/apps/flutter/windows/runner/Runner.rc b/apps/flutter/windows/runner/Runner.rc new file mode 100644 index 0000000..b31e86e --- /dev/null +++ b/apps/flutter/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "com.example" "\0" + VALUE "FileDescription", "bevy_tasks" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "bevy_tasks" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 com.example. All rights reserved." "\0" + VALUE "OriginalFilename", "bevy_tasks.exe" "\0" + VALUE "ProductName", "bevy_tasks" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/apps/flutter/windows/runner/flutter_window.cpp b/apps/flutter/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/apps/flutter/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/apps/flutter/windows/runner/flutter_window.h b/apps/flutter/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/apps/flutter/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/apps/flutter/windows/runner/main.cpp b/apps/flutter/windows/runner/main.cpp new file mode 100644 index 0000000..c0613b9 --- /dev/null +++ b/apps/flutter/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"bevy_tasks", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/apps/flutter/windows/runner/resource.h b/apps/flutter/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/apps/flutter/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/apps/flutter/windows/runner/resources/app_icon.ico b/apps/flutter/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000..c04e20c Binary files /dev/null and b/apps/flutter/windows/runner/resources/app_icon.ico differ diff --git a/apps/flutter/windows/runner/runner.exe.manifest b/apps/flutter/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/apps/flutter/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/apps/flutter/windows/runner/utils.cpp b/apps/flutter/windows/runner/utils.cpp new file mode 100644 index 0000000..3a0b465 --- /dev/null +++ b/apps/flutter/windows/runner/utils.cpp @@ -0,0 +1,65 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + unsigned int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + -1, nullptr, 0, nullptr, nullptr) + -1; // remove the trailing null character + int input_length = (int)wcslen(utf16_string); + std::string utf8_string; + if (target_length == 0 || target_length > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/apps/flutter/windows/runner/utils.h b/apps/flutter/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/apps/flutter/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/apps/flutter/windows/runner/win32_window.cpp b/apps/flutter/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/apps/flutter/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/apps/flutter/windows/runner/win32_window.h b/apps/flutter/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/apps/flutter/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_