Disable buttons in native window mode

LinwoodDev · Jul 22, 2022 · f2383e9 · f2383e9
1 parent 59c769f
commit f2383e9
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 46 deletions.
diff --git a/app/lib/main.dart b/app/lib/main.dart
@@ -192,9 +192,11 @@ class ButterflyApp extends StatelessWidget {
         buildWhen: (previous, current) =>
             previous.nativeWindowTitleBar != current.nativeWindowTitleBar,
         builder: (context, settings) {
-          windowManager.setTitleBarStyle(settings.nativeWindowTitleBar
-              ? TitleBarStyle.normal
-              : TitleBarStyle.hidden);
+          if (!kIsWeb && isWindow()) {
+            windowManager.setTitleBarStyle(settings.nativeWindowTitleBar
+                ? TitleBarStyle.normal
+                : TitleBarStyle.hidden);
+          }
           return RepositoryProvider(
             create: (context) =>
                 SyncService(context, context.read<SettingsCubit>()),
@@ -207,10 +209,6 @@ class ButterflyApp extends StatelessWidget {
   }
 
   Widget _buildApp() {
-    final virtualWindowFrameBuilder =
-        kIsWeb || (!Platform.isWindows && !Platform.isLinux)
-            ? null
-            : VirtualWindowFrameInit();
     return BlocBuilder<SettingsCubit, ButterflySettings>(
         buildWhen: (previous, current) =>
             previous.theme != current.theme ||
@@ -230,10 +228,7 @@ class ButterflyApp extends StatelessWidget {
                 if (child == null) {
                   return const Center(child: CircularProgressIndicator());
                 }
-                if (kIsWeb || virtualWindowFrameBuilder == null) {
-                  return child;
-                }
-                return virtualWindowFrameBuilder(context, child);
+                return child;
               },
               darkTheme: ThemeManager.getThemeByName(state.design, dark: true),
             ));

diff --git a/app/lib/views/app_bar.dart b/app/lib/views/app_bar.dart
@@ -42,11 +42,11 @@ class PadAppBar extends StatelessWidget with PreferredSizeWidget {
   Widget build(BuildContext context) {
     var bloc = context.read<DocumentBloc>();
     return GestureDetector(onSecondaryTap: () {
-      if (isWindow()) {
+      if (!kIsWeb && isWindow()) {
         windowManager.popUpWindowMenu();
       }
     }, onLongPress: () {
-      if (isWindow()) {
+      if (!kIsWeb && isWindow()) {
         windowManager.popUpWindowMenu();
       }
     }, child: LayoutBuilder(
@@ -185,44 +185,57 @@ class PadAppBar extends StatelessWidget with PreferredSizeWidget {
                                 isMobile: false,
                               )),
                           ]);
-                      if (!kIsWeb && isWindow()) {
+                      if (!kIsWeb &&
+                          isWindow() &&
+                          !context
+                              .read<SettingsCubit>()
+                              .state
+                              .nativeWindowTitleBar) {
                         return DragToMoveArea(child: title);
                       }
                       return title;
                     })),
             actions: [
               BlocBuilder<DocumentBloc, DocumentState>(
-                builder: (context, state) => Row(
-                  children: [
-                    if (!isMobile) ...[
-                      IconButton(
-                        icon: const Icon(
-                            PhosphorIcons.arrowCounterClockwiseLight),
-                        tooltip: AppLocalizations.of(context)!.undo,
-                        onPressed: !bloc.canUndo
-                            ? null
-                            : () {
-                                Actions.maybeInvoke<UndoIntent>(
-                                    context, UndoIntent(context));
-                              },
-                      ),
-                      IconButton(
-                        icon: const Icon(PhosphorIcons.arrowClockwiseLight),
-                        tooltip: AppLocalizations.of(context)!.redo,
-                        onPressed: !bloc.canRedo
-                            ? null
-                            : () {
-                                Actions.maybeInvoke<RedoIntent>(
-                                    context, RedoIntent(context));
-                              },
-                      ),
-                    ],
-                    if (isWindow()) ...[
-                      const VerticalDivider(),
-                      const WindowButtons()
-                    ]
-                  ],
-                ),
+                builder: (context, state) =>
+                    BlocBuilder<SettingsCubit, ButterflySettings>(
+                        buildWhen: (previous, current) =>
+                            previous.nativeWindowTitleBar !=
+                            current.nativeWindowTitleBar,
+                        builder: (context, settings) => Row(
+                              children: [
+                                if (!isMobile) ...[
+                                  IconButton(
+                                    icon: const Icon(PhosphorIcons
+                                        .arrowCounterClockwiseLight),
+                                    tooltip: AppLocalizations.of(context)!.undo,
+                                    onPressed: !bloc.canUndo
+                                        ? null
+                                        : () {
+                                            Actions.maybeInvoke<UndoIntent>(
+                                                context, UndoIntent(context));
+                                          },
+                                  ),
+                                  IconButton(
+                                    icon: const Icon(
+                                        PhosphorIcons.arrowClockwiseLight),
+                                    tooltip: AppLocalizations.of(context)!.redo,
+                                    onPressed: !bloc.canRedo
+                                        ? null
+                                        : () {
+                                            Actions.maybeInvoke<RedoIntent>(
+                                                context, RedoIntent(context));
+                                          },
+                                  ),
+                                ],
+                                if (isWindow() &&
+                                    kIsWeb &&
+                                    !settings.nativeWindowTitleBar) ...[
+                                  const VerticalDivider(),
+                                  const WindowButtons()
+                                ]
+                              ],
+                            )),
               )
             ]);
       },

diff --git a/app/lib/views/main.dart b/app/lib/views/main.dart
@@ -426,7 +426,8 @@ class _WindowButtonsState extends State<WindowButtons> with WindowListener {
   @override
   @override
   Widget build(BuildContext context) {
-    if (isWindow()) {
+    if (isWindow() &&
+        !context.read<SettingsCubit>().state.nativeWindowTitleBar) {
       return LayoutBuilder(
         builder: (context, constraints) => Padding(
           padding: const EdgeInsets.all(8.0),