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
7 changes: 7 additions & 0 deletions lib/app_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import 'package:kazumi/utils/logger.dart';
import 'package:window_manager/window_manager.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/bean/settings/theme_provider.dart';
import 'package:kazumi/bean/appbar/window_control_overlay.dart';
import 'package:provider/provider.dart';
import 'package:kazumi/utils/constants.dart';

Expand Down Expand Up @@ -278,6 +279,12 @@ class _AppWidgetState extends State<AppWidget>
],
locale: const Locale.fromSubtags(
languageCode: 'zh', scriptCode: 'Hans', countryCode: "CN"),
builder: (context, child) {
if (child == null) {
return const SizedBox.shrink();
}
return WindowControlOverlay(child: child);
},
theme: themeProvider.light,
darkTheme: themeProvider.dark,
themeMode: themeProvider.themeMode,
Expand Down
11 changes: 6 additions & 5 deletions lib/bean/appbar/sys_app_bar.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:kazumi/bean/appbar/window_control_overlay.dart';
import 'package:kazumi/bean/widget/embedded_native_control_area.dart';
import 'package:kazumi/utils/storage.dart';
import 'package:kazumi/utils/utils.dart';
Expand Down Expand Up @@ -52,11 +53,11 @@ class SysAppBar extends StatelessWidget implements PreferredSizeWidget {
acs.addAll(actions!);
}
if (Utils.isDesktop()) {
// acs.add(IconButton(onPressed: () => windowManager.minimize(), icon: const Icon(Icons.minimize)));
if (!showWindowButton()) {
acs.add(CloseButton(onPressed: () => windowManager.close()));
}
acs.add(const SizedBox(width: 8));
acs.add(
SizedBox(
width: showWindowButton() ? 8 : windowControlOverlayReservedWidth,
),
);
}
return GestureDetector(
onPanStart: (_) =>
Expand Down
Loading
Loading