Sync with core 144fca5: title-bar double-click preferences (#48)

FlutterDragToMoveArea performs the system title-bar double-click action.

Author: lijy91

bindings/csharp/src/CNativeAPI/generated/Window.cs

@@ -179,6 +179,10 @@ public static partial class Interop
     [return: MarshalAs(UnmanagedType.I1)]
     public static extern bool native_window_is_window_control_buttons_visible(ulong self);
 
+    [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
+    [return: MarshalAs(UnmanagedType.I1)]
+    public static extern bool native_window_perform_title_bar_double_click(ulong self);
+
     [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
     [return: MarshalAs(UnmanagedType.I1)]
     public static extern bool native_window_reset_title_bar_colors(ulong self);

bindings/csharp/src/NativeAPI/Window.cs

@@ -830,6 +830,12 @@ public static bool IsSystemMenuSupported()
         return rawResult;
     }
 
+    public bool PerformTitleBarDoubleClick()
+    {
+        var rawResult = Interop.native_window_perform_title_bar_double_click(NativeHandle);
+        return rawResult;
+    }
+
     public void StartDragging()
     {
         Interop.native_window_start_dragging(NativeHandle);

bindings/dart/cnativeapi/lib/src/bindings_generated.dart

@@ -2680,6 +2680,9 @@ external void native_window_maximize(int window);
 @ffi.Native<ffi.Void Function(native_window_t)>()
 external void native_window_minimize(int window);
 
+@ffi.Native<ffi.Bool Function(native_window_t)>()
+external bool native_window_perform_title_bar_double_click(int window);
+
 @ffi.Native<ffi.Bool Function(native_window_t)>()
 external bool native_window_reset_title_bar_colors(int window);
 

bindings/dart/nativeapi/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## 0.4.1
 
+* On macOS, empty backgrounds in a hidden window's original title-bar band
+  perform the preferred double-click action automatically. Controls and custom
+  mouse handlers keep their gestures. The native Fill action is requested when
+  the OS provides it.
+
+* Adds `Window.performTitleBarDoubleClick()` for custom title bars, respecting
+  the macOS Maximize, Minimize and None preferences.
+
 * `Window.setIgnoreMouseEvents(ignore, forward)` now returns whether the native
   policy was applied. Linux implements pass-through and restores input shapes;
   macOS, Windows and X11 can forward hover movement while clicks pass through.

bindings/dart/nativeapi/lib/src/window.dart

@@ -768,6 +768,10 @@ class Window {
     return c.native_window_is_system_menu_supported();
   }
 
+  bool performTitleBarDoubleClick() {
+    return c.native_window_perform_title_bar_double_click(nativeHandle);
+  }
+
   void startDragging() {
     c.native_window_start_dragging(nativeHandle);
   }

bindings/dart/nativeapi_flutter/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 0.4.1
 
+* `DragToMoveArea` follows the macOS title-bar double-click preference,
+  including Minimize and None, through the native window action.
+
 * Requires nativeapi 0.4.1.
 * `DragToMoveArea` opens the native system window menu on a secondary-button
   press on Windows and supporting Linux window managers.

bindings/dart/nativeapi_flutter/lib/src/widgets/drag_to_move_area.dart

@@ -12,8 +12,8 @@ import 'package:nativeapi/nativeapi.dart'
         TextField,
         View;
 
-/// A custom title-bar region that drags the window and toggles maximization
-/// on double tap. A secondary-button press opens the native system window menu
+/// A custom title-bar region that drags the window and performs the native
+/// title-bar double-click action, including the macOS user preference. A secondary-button press opens the native system window menu
 /// where supported (Windows, or a supporting Linux window manager).
 class DragToMoveArea extends StatelessWidget {
   const DragToMoveArea({super.key, required this.child, this.window});
@@ -36,13 +36,8 @@ class DragToMoveArea extends StatelessWidget {
         (window ?? WindowManager.instance.getCurrent())?.startDragging();
       },
       onDoubleTap: () {
-        final target = window ?? WindowManager.instance.getCurrent();
-        if (target == null) return;
-        if (target.isMaximized) {
-          target.unmaximize();
-        } else {
-          target.maximize();
-        }
+        (window ?? WindowManager.instance.getCurrent())
+            ?.performTitleBarDoubleClick();
       },
       child: child,
     );

bindings/dart/nativeapi_flutter/test/widgets/window_drag_areas_test.dart

@@ -8,7 +8,8 @@ class _Window extends Window {
 
   int dragCount = 0;
   final edges = <ResizeEdge>[];
-  bool maximized = false;
+  int doubleClickCount = 0;
+  bool doubleClickAccepted = true;
   final systemMenuPositions = <Point>[];
 
   @override
@@ -24,13 +25,17 @@ class _Window extends Window {
   void startResizing(ResizeEdge edge) => edges.add(edge);
 
   @override
-  bool get isMaximized => maximized;
+  bool performTitleBarDoubleClick() {
+    doubleClickCount++;
+    return doubleClickAccepted;
+  }
 
   @override
-  void maximize() => maximized = true;
+  void maximize() => throw StateError('must delegate the platform preference');
 
   @override
-  void unmaximize() => maximized = false;
+  void unmaximize() =>
+      throw StateError('must delegate the platform preference');
 }
 
 Widget _host(Widget child) => Directionality(
@@ -78,29 +83,33 @@ void main() {
       expect(window.systemMenuPositions, hasLength(1));
     },
   );
-  testWidgets('move area drags and toggles maximization on double tap', (
-    tester,
-  ) async {
-    final window = _Window();
-    await tester.pumpWidget(
-      _host(
-        DragToMoveArea(
-          window: window,
-          child: const SizedBox(width: 200, height: 100),
+  testWidgets(
+    'move area drags and delegates each double tap without a fallback',
+    (tester) async {
+      final window = _Window();
+      await tester.pumpWidget(
+        _host(
+          DragToMoveArea(
+            window: window,
+            child: const SizedBox(width: 200, height: 100),
+          ),
         ),
-      ),
-    );
-    final center = tester.getCenter(find.byType(DragToMoveArea));
-    await _drag(tester, center);
-    expect(window.dragCount, 1);
-    for (final expected in [true, false]) {
-      await tester.tapAt(center);
-      await tester.pump(const Duration(milliseconds: 50));
-      await tester.tapAt(center);
-      await tester.pumpAndSettle();
-      expect(window.maximized, expected);
-    }
-  });
+      );
+      final center = tester.getCenter(find.byType(DragToMoveArea));
+      await _drag(tester, center);
+      expect(window.dragCount, 1);
+      for (final accepted in [true, false]) {
+        window.doubleClickAccepted = accepted;
+        final previous = window.doubleClickCount;
+        await tester.tapAt(center);
+        await tester.pump(const Duration(milliseconds: 50));
+        await tester.tapAt(center);
+        await tester.pumpAndSettle();
+        expect(window.doubleClickCount, previous + 1);
+        expect(tester.takeException(), isNull);
+      }
+    },
+  );
 
   testWidgets('all eight handles send the correct native resize edge', (
     tester,

bindings/js/lib/window.ts

@@ -478,6 +478,10 @@ export class Window extends NativeObject {
     return native.native_window_is_system_menu_supported();
   }
 
+  performTitleBarDoubleClick(): boolean {
+    return native.native_window_perform_title_bar_double_click(this.nativeHandle);
+  }
+
   startDragging(): void {
     native.native_window_start_dragging(this.nativeHandle);
   }

bindings/js/src/generated/window.cc

@@ -1708,6 +1708,21 @@ napi_value Js_native_window_is_system_menu_supported(napi_env env, napi_callback
   return Value::Bool(result).ToJs(env);
 }
 
+napi_value Js_native_window_perform_title_bar_double_click(napi_env env, napi_callback_info info) {
+  Args args(env, info);
+  if (!args.ok()) {
+    return nullptr;
+  }
+  Arena arena;
+  (void)arena;
+  uint64_t self = 0;
+  if (!GetHandle(env, args[0], &self)) {
+    return nullptr;
+  }
+  auto result = OnMainThread([&] { return native_window_perform_title_bar_double_click(self); });
+  return Value::Bool(result).ToJs(env);
+}
+
 napi_value Js_native_window_start_dragging(napi_env env, napi_callback_info info) {
   Args args(env, info);
   if (!args.ok()) {
@@ -1849,6 +1864,7 @@ void RegisterWindow(napi_env env, napi_value exports) {
   Export(env, exports, "native_window_is_focusable", Js_native_window_is_focusable);
   Export(env, exports, "native_window_show_system_menu", Js_native_window_show_system_menu);
   Export(env, exports, "native_window_is_system_menu_supported", Js_native_window_is_system_menu_supported);
+  Export(env, exports, "native_window_perform_title_bar_double_click", Js_native_window_perform_title_bar_double_click);
   Export(env, exports, "native_window_start_dragging", Js_native_window_start_dragging);
   Export(env, exports, "native_window_start_resizing", Js_native_window_start_resizing);
 }