HyperNet/Surface
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix window decoration on macOS

Browse Source
This commit is contained in:
LittleSheep 2024-12-08 19:59:04 +08:00
parent 9f4185dff6
commit 0afb6b9c5b
1 changed files with 38 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
lib/widgets/navigation/app_scaffold.dart
View File

@ -23,6 +23,7 @@ class AppPageScaffold extends StatelessWidget {
final Widget? body;
final bool showAppBar;
final bool showBottomNavigation;
const AppPageScaffold({
super.key,
this.title,
@ -34,11 +35,9 @@ class AppPageScaffold extends StatelessWidget {
@override
Widget build(BuildContext context) {
final state = GoRouter.maybeOf(context);
final routeName =
state?.routerDelegate.currentConfiguration.last.route.name;
final routeName = state?.routerDelegate.currentConfiguration.last.route.name;
final autoTitle =
state != null ? 'screen${routeName?.capitalize()}' : 'screen';
final autoTitle = state != null ? 'screen${routeName?.capitalize()}' : 'screen';
return Scaffold(
appBar: showAppBar
@ -53,29 +52,21 @@ class AppPageScaffold extends StatelessWidget {
class AppRootScaffold extends StatelessWidget {
final Widget body;
const AppRootScaffold({super.key, required this.body});
@override
Widget build(BuildContext context) {
final devicePixelRatio = MediaQuery.of(context).devicePixelRatio;
final isCollapseDrawer =
ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
final isCollapseDrawer = ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE);
final isExpandDrawer = ResponsiveBreakpoints.of(context).largerThan(TABLET);
final routeName = GoRouter.of(context)
.routerDelegate
.currentConfiguration
.last
.route
.name;
final isShowBottomNavigation =
NavigationProvider.kShowBottomNavScreen.contains(routeName)
final routeName = GoRouter.of(context).routerDelegate.currentConfiguration.last.route.name;
final isShowBottomNavigation = NavigationProvider.kShowBottomNavScreen.contains(routeName)
? ResponsiveBreakpoints.of(context).smallerOrEqualTo(MOBILE)
: false;
final isPopable = !NavigationProvider.kAllDestination
.map((ele) => ele.screen)
.contains(routeName);
final isPopable = !NavigationProvider.kAllDestination.map((ele) => ele.screen).contains(routeName);
final innerWidget = isCollapseDrawer
? body
@ -90,9 +81,7 @@ class AppRootScaffold extends StatelessWidget {
),
),
),
child: isExpandDrawer
? AppNavigationDrawer(elevation: 0)
: AppRailNavigation(),
child: isExpandDrawer ? AppNavigationDrawer(elevation: 0) : AppRailNavigation(),
),
Expanded(child: body),
],
@ -112,13 +101,19 @@ class AppRootScaffold extends StatelessWidget {
key: globalRootScaffoldKey,
body: Column(
children: [
if (!kIsWeb &&
(Platform.isWindows || Platform.isLinux || Platform.isMacOS))
WindowBorder(
if (!kIsWeb && (Platform.isWindows || Platform.isLinux || Platform.isMacOS))
Container(
decoration: BoxDecoration(
border: Border(
bottom: BorderSide(
color: Theme.of(context).dividerColor,
width: 1,
width: 1 / devicePixelRatio,
),
),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: Platform.isMacOS ? MainAxisAlignment.center : MainAxisAlignment.start,
children: [
WindowTitleBarBox(
child: MoveWindow(
@ -128,6 +123,7 @@ class AppRootScaffold extends StatelessWidget {
).padding(horizontal: 12, vertical: 5),
),
),
if (!Platform.isMacOS)
Expanded(
child: WindowTitleBarBox(
child: Row(
@ -153,8 +149,7 @@ class AppRootScaffold extends StatelessWidget {
),
drawer: !isExpandDrawer ? AppNavigationDrawer() : null,
drawerEdgeDragWidth: isPopable ? 0 : null,
bottomNavigationBar:
isShowBottomNavigation ? AppBottomNavigationBar() : null,
bottomNavigationBar: isShowBottomNavigation ? AppBottomNavigationBar() : null,
),
);
}