Sync with core 286a96e: native window system menus (#66)

Author: lijy91

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

@@ -147,6 +147,10 @@ public static partial class Interop
     [return: MarshalAs(UnmanagedType.I1)]
     public static extern bool native_window_is_shaped(ulong self);
 
+    [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
+    [return: MarshalAs(UnmanagedType.I1)]
+    public static extern bool native_window_is_system_menu_supported();
+
     [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
     [return: MarshalAs(UnmanagedType.I1)]
     public static extern bool native_window_is_visible(ulong self);
@@ -207,6 +211,10 @@ public static partial class Interop
     [return: MarshalAs(UnmanagedType.I1)]
     public static extern bool native_window_set_visual_effect(ulong self, int effect);
 
+    [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
+    [return: MarshalAs(UnmanagedType.I1)]
+    public static extern bool native_window_show_system_menu(ulong self, native_point_t position);
+
     [DllImport(Libraries.NativeApi, CallingConvention = CallingConvention.Cdecl)]
     public static extern IntPtr native_window_get_native_object(ulong handle);
 

bindings/csharp/src/NativeAPI/Window.cs

@@ -801,6 +801,19 @@ public bool IsFocusable
         }
     }
 
+    public bool ShowSystemMenu(Point position)
+    {
+        var rawPosition = position.ToRaw();
+        var rawResult = Interop.native_window_show_system_menu(NativeHandle, rawPosition);
+        return rawResult;
+    }
+
+    public static bool IsSystemMenuSupported()
+    {
+        var rawResult = Interop.native_window_is_system_menu_supported();
+        return rawResult;
+    }
+
     public void StartDragging()
     {
         Interop.native_window_start_dragging(NativeHandle);

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

@@ -2553,6 +2553,9 @@ external bool native_window_is_shape_supported();
 @ffi.Native<ffi.Bool Function(native_window_t)>()
 external bool native_window_is_shaped(int window);
 
+@ffi.Native<ffi.Bool Function()>()
+external bool native_window_is_system_menu_supported();
+
 @ffi.Native<ffi.Bool Function(native_window_t)>()
 external bool native_window_is_visible(int window);
 
@@ -2930,6 +2933,12 @@ external void native_window_show(int window);
 @ffi.Native<ffi.Void Function(native_window_t)>()
 external void native_window_show_inactive(int window);
 
+@ffi.Native<ffi.Bool Function(native_window_t, native_point_t)>()
+external bool native_window_show_system_menu(
+  int window,
+  native_point_t position,
+);
+
 @ffi.Native<ffi.Void Function(native_window_t)>()
 external void native_window_start_dragging(int window);
 

bindings/dart/nativeapi/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## 0.4.1
 
+* `Window.showSystemMenu(Point)` and `Window.isSystemMenuSupported()`: native
+  system window menu on Windows and supporting Linux window managers. Positions
+  are logical pixels relative to the content area. Windows keeps command states
+  current; Wayland requires an active pointer press in the target window.
+
 * `Window.setContentProtection()`, `isContentProtected` and
   `Window.isContentProtectionSupported()`: native capture policy on Windows and
   macOS. Recent macOS ScreenCaptureKit ignores the legacy sharing policy; Linux

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

@@ -742,6 +742,20 @@ class Window {
     return c.native_window_is_focusable(nativeHandle);
   }
 
+  bool showSystemMenu(Point position) {
+    final positionPointer = position.allocNative();
+    final result = c.native_window_show_system_menu(
+      nativeHandle,
+      positionPointer.ref,
+    );
+    Point.freeNative(positionPointer);
+    return result;
+  }
+
+  static bool isSystemMenuSupported() {
+    return c.native_window_is_system_menu_supported();
+  }
+
   void startDragging() {
     c.native_window_start_dragging(nativeHandle);
   }

bindings/dart/nativeapi_flutter/CHANGELOG.md

@@ -1,6 +1,8 @@
 ## 0.4.1
 
 * Requires nativeapi 0.4.1.
+* `DragToMoveArea` opens the native system window menu on a secondary-button
+  press on Windows and supporting Linux window managers.
 * `runNativeApp` is not re-exported: it is for plain Dart programs, and a
   Flutter app's engine already runs the event loop.
 

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

@@ -13,7 +13,8 @@ import 'package:nativeapi/nativeapi.dart'
         View;
 
 /// A custom title-bar region that drags the window and toggles maximization
-/// on double tap.
+/// on double tap. 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});
 
@@ -26,6 +27,11 @@ class DragToMoveArea extends StatelessWidget {
   Widget build(BuildContext context) {
     return GestureDetector(
       behavior: HitTestBehavior.translucent,
+      onSecondaryTapDown: (details) {
+        (window ?? WindowManager.instance.getCurrent())?.showSystemMenu(
+          Point(x: details.globalPosition.dx, y: details.globalPosition.dy),
+        );
+      },
       onPanStart: (_) {
         (window ?? WindowManager.instance.getCurrent())?.startDragging();
       },

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

@@ -9,6 +9,13 @@ class _Window extends Window {
   int dragCount = 0;
   final edges = <ResizeEdge>[];
   bool maximized = false;
+  final systemMenuPositions = <Point>[];
+
+  @override
+  bool showSystemMenu(Point position) {
+    systemMenuPositions.add(position);
+    return true;
+  }
 
   @override
   void startDragging() => dragCount++;
@@ -42,6 +49,35 @@ Future<void> _drag(WidgetTester tester, Offset position) async {
 }
 
 void main() {
+  testWidgets(
+    'move area opens system menu on secondary down at content coordinates',
+    (tester) async {
+      final window = _Window();
+      await tester.pumpWidget(
+        _host(
+          DragToMoveArea(
+            window: window,
+            child: const SizedBox(width: 200, height: 100),
+          ),
+        ),
+      );
+      final point =
+          tester.getCenter(find.byType(DragToMoveArea)) + const Offset(12, 8);
+      final gesture = await tester.startGesture(
+        point,
+        kind: PointerDeviceKind.mouse,
+        buttons: kSecondaryMouseButton,
+      );
+      await tester.pump(const Duration(milliseconds: 150));
+      expect(window.systemMenuPositions, hasLength(1));
+      expect(window.systemMenuPositions.single.x, point.dx);
+      expect(window.systemMenuPositions.single.y, point.dy);
+      expect(window.dragCount, 0);
+      await gesture.up();
+      await tester.pumpAndSettle();
+      expect(window.systemMenuPositions, hasLength(1));
+    },
+  );
   testWidgets('move area drags and toggles maximization on double tap', (
     tester,
   ) async {

bindings/js/lib/window.ts

@@ -462,6 +462,14 @@ export class Window extends NativeObject {
     return native.native_window_is_focusable(this.nativeHandle);
   }
 
+  showSystemMenu(position: Point): boolean {
+    return native.native_window_show_system_menu(this.nativeHandle, position);
+  }
+
+  static isSystemMenuSupported(): boolean {
+    return native.native_window_is_system_menu_supported();
+  }
+
   startDragging(): void {
     native.native_window_start_dragging(this.nativeHandle);
   }

bindings/js/src/generated/window.cc

@@ -1648,6 +1648,36 @@ napi_value Js_native_window_is_focusable(napi_env env, napi_callback_info info)
   return Value::Bool(result).ToJs(env);
 }
 
+napi_value Js_native_window_show_system_menu(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;
+  }
+  native_point_t p0 = {};
+  if (!FromJs(env, args[1], &p0, arena)) {
+    return nullptr;
+  }
+  auto result = OnMainThread([&] { return native_window_show_system_menu(self, p0); });
+  return Value::Bool(result).ToJs(env);
+}
+
+napi_value Js_native_window_is_system_menu_supported(napi_env env, napi_callback_info info) {
+  Args args(env, info);
+  if (!args.ok()) {
+    return nullptr;
+  }
+  Arena arena;
+  (void)arena;
+  auto result = OnMainThread([&] { return native_window_is_system_menu_supported(); });
+  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()) {
@@ -1785,6 +1815,8 @@ void RegisterWindow(napi_env env, napi_value exports) {
   Export(env, exports, "native_window_is_ignore_mouse_events", Js_native_window_is_ignore_mouse_events);
   Export(env, exports, "native_window_set_focusable", Js_native_window_set_focusable);
   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_start_dragging", Js_native_window_start_dragging);
   Export(env, exports, "native_window_start_resizing", Js_native_window_start_resizing);
 }