Sync with core 7330aa6: window property change events (#72)

Author: lijy91

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

@@ -21,6 +21,7 @@ public struct DataUnion
         [FieldOffset(0)] public MovedData moved;
         [FieldOffset(0)] public ResizedData resized;
         [FieldOffset(0)] public CloseRequestedData close_requested;
+        [FieldOffset(0)] public PropertyChangedData property_changed;
     }
 
     [StructLayout(LayoutKind.Sequential)]
@@ -40,6 +41,12 @@ public struct CloseRequestedData
     {
         public ulong request;
     }
+
+    [StructLayout(LayoutKind.Sequential)]
+    public struct PropertyChangedData
+    {
+        public int property;
+    }
 }
 
 [StructLayout(LayoutKind.Sequential)]

bindings/csharp/src/NativeAPI/Window.cs

@@ -23,6 +23,21 @@ public enum WindowCornerPreference
     RoundSmall = 3,
 }
 
+public enum WindowProperty
+{
+    Title = 0,
+    Resizable = 1,
+    Movable = 2,
+    Minimizable = 3,
+    Maximizable = 4,
+    FullScreenable = 5,
+    Closable = 6,
+    WindowControlButtonsVisible = 7,
+    AlwaysOnTop = 8,
+    AlwaysOnBottom = 9,
+    TitleBarStyle = 10,
+}
+
 public enum VisualEffect
 {
     None = 0,
@@ -64,6 +79,7 @@ public sealed record Closed(uint WindowId) : WindowEvent;
     public sealed record EnteredFullScreen(uint WindowId) : WindowEvent;
     public sealed record ExitedFullScreen(uint WindowId) : WindowEvent;
     public sealed record CloseRequested(uint WindowId, EventRequest Request) : WindowEvent;
+    public sealed record PropertyChanged(uint WindowId, WindowProperty Property) : WindowEvent;
 
     internal static WindowEvent? FromRaw(in native_window_event_t raw)
     {
@@ -81,6 +97,7 @@ public sealed record CloseRequested(uint WindowId, EventRequest Request) : Windo
             case 9: return new EnteredFullScreen(raw.window_id);
             case 10: return new ExitedFullScreen(raw.window_id);
             case 11: return new CloseRequested(raw.window_id, new EventRequest(raw.data.close_requested.request, ownsHandle: false));
+            case 12: return new PropertyChanged(raw.window_id, (WindowProperty)raw.data.property_changed.property);
             default: return null;
         }
     }

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

@@ -3429,6 +3429,20 @@ final class UnnamedStruct$18 extends ffi.Struct {
   }) => $allocator<UnnamedStruct$18>()..ref.request = request;
 }
 
+final class UnnamedStruct$19 extends ffi.Struct {
+  @ffi.UnsignedInt()
+  external int propertyAsInt;
+
+  native_window_property_t get property =>
+      native_window_property_t.fromValue(propertyAsInt);
+  set property(native_window_property_t value) => propertyAsInt = value.value;
+
+  static ffi.Pointer<UnnamedStruct$19> $allocate(
+    ffi.Allocator $allocator, {
+    required native_window_property_t property,
+  }) => $allocator<UnnamedStruct$19>()..ref.property = property;
+}
+
 final class UnnamedStruct$2 extends ffi.Struct {
   @ffi.UnsignedInt()
   external int operationAsInt;
@@ -3565,6 +3579,8 @@ final class UnnamedUnion$9 extends ffi.Union {
   external UnnamedStruct$17 resized;
 
   external UnnamedStruct$18 close_requested;
+
+  external UnnamedStruct$19 property_changed;
 }
 
 typedef native_application_event_callback_t =
@@ -5466,7 +5482,8 @@ enum native_window_event_type_t {
   NATIVE_WINDOW_EVENT_TYPE_CLOSED(8),
   NATIVE_WINDOW_EVENT_TYPE_ENTERED_FULL_SCREEN(9),
   NATIVE_WINDOW_EVENT_TYPE_EXITED_FULL_SCREEN(10),
-  NATIVE_WINDOW_EVENT_TYPE_CLOSE_REQUESTED(11);
+  NATIVE_WINDOW_EVENT_TYPE_CLOSE_REQUESTED(11),
+  NATIVE_WINDOW_EVENT_TYPE_PROPERTY_CHANGED(12);
 
   final int value;
   const native_window_event_type_t(this.value);
@@ -5484,6 +5501,7 @@ enum native_window_event_type_t {
     9 => NATIVE_WINDOW_EVENT_TYPE_ENTERED_FULL_SCREEN,
     10 => NATIVE_WINDOW_EVENT_TYPE_EXITED_FULL_SCREEN,
     11 => NATIVE_WINDOW_EVENT_TYPE_CLOSE_REQUESTED,
+    12 => NATIVE_WINDOW_EVENT_TYPE_PROPERTY_CHANGED,
     _ => throw ArgumentError(
       'Unknown value for native_window_event_type_t: $value',
     ),
@@ -5530,6 +5548,40 @@ typedef native_window_manager_set_will_show_hook_callback_tFunction =
 typedef Dartnative_window_manager_set_will_show_hook_callback_tFunction =
     void Function(int arg0, ffi.Pointer<ffi.Void> user_data);
 
+enum native_window_property_t {
+  NATIVE_WINDOW_PROPERTY_TITLE(0),
+  NATIVE_WINDOW_PROPERTY_RESIZABLE(1),
+  NATIVE_WINDOW_PROPERTY_MOVABLE(2),
+  NATIVE_WINDOW_PROPERTY_MINIMIZABLE(3),
+  NATIVE_WINDOW_PROPERTY_MAXIMIZABLE(4),
+  NATIVE_WINDOW_PROPERTY_FULL_SCREENABLE(5),
+  NATIVE_WINDOW_PROPERTY_CLOSABLE(6),
+  NATIVE_WINDOW_PROPERTY_WINDOW_CONTROL_BUTTONS_VISIBLE(7),
+  NATIVE_WINDOW_PROPERTY_ALWAYS_ON_TOP(8),
+  NATIVE_WINDOW_PROPERTY_ALWAYS_ON_BOTTOM(9),
+  NATIVE_WINDOW_PROPERTY_TITLE_BAR_STYLE(10);
+
+  final int value;
+  const native_window_property_t(this.value);
+
+  static native_window_property_t fromValue(int value) => switch (value) {
+    0 => NATIVE_WINDOW_PROPERTY_TITLE,
+    1 => NATIVE_WINDOW_PROPERTY_RESIZABLE,
+    2 => NATIVE_WINDOW_PROPERTY_MOVABLE,
+    3 => NATIVE_WINDOW_PROPERTY_MINIMIZABLE,
+    4 => NATIVE_WINDOW_PROPERTY_MAXIMIZABLE,
+    5 => NATIVE_WINDOW_PROPERTY_FULL_SCREENABLE,
+    6 => NATIVE_WINDOW_PROPERTY_CLOSABLE,
+    7 => NATIVE_WINDOW_PROPERTY_WINDOW_CONTROL_BUTTONS_VISIBLE,
+    8 => NATIVE_WINDOW_PROPERTY_ALWAYS_ON_TOP,
+    9 => NATIVE_WINDOW_PROPERTY_ALWAYS_ON_BOTTOM,
+    10 => NATIVE_WINDOW_PROPERTY_TITLE_BAR_STYLE,
+    _ => throw ArgumentError(
+      'Unknown value for native_window_property_t: $value',
+    ),
+  };
+}
+
 /// Opaque WindowShadow handle.
 ///
 /// A generational index into the library's handle table, NOT a pointer:

bindings/dart/nativeapi/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## 0.4.1
 
+* `WindowPropertyChangedEvent`: a window's title, resizable / movable /
+  minimizable / maximizable / full-screenable / closable state, control button
+  visibility, always-on-top / on-bottom and title bar style report each change,
+  whether a setter on any wrapper or the system or other code changed the
+  native window. Read the new value through the getter `WindowProperty` names.
+
 * Apps that also target the web can depend on nativeapi again
   (leanflutter/tray_manager#108). On the web `package:nativeapi` resolves to a
   pure-Dart mirror without `dart:ffi`: the same classes, enums, value types and

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

@@ -48,6 +48,38 @@ enum WindowCornerPreference {
   };
 }
 
+enum WindowProperty {
+  title(0),
+  resizable(1),
+  movable(2),
+  minimizable(3),
+  maximizable(4),
+  fullScreenable(5),
+  closable(6),
+  windowControlButtonsVisible(7),
+  alwaysOnTop(8),
+  alwaysOnBottom(9),
+  titleBarStyle(10);
+
+  const WindowProperty(this.value);
+  final int value;
+
+  static WindowProperty fromValue(int value) => switch (value) {
+    0 => WindowProperty.title,
+    1 => WindowProperty.resizable,
+    2 => WindowProperty.movable,
+    3 => WindowProperty.minimizable,
+    4 => WindowProperty.maximizable,
+    5 => WindowProperty.fullScreenable,
+    6 => WindowProperty.closable,
+    7 => WindowProperty.windowControlButtonsVisible,
+    8 => WindowProperty.alwaysOnTop,
+    9 => WindowProperty.alwaysOnBottom,
+    10 => WindowProperty.titleBarStyle,
+    _ => WindowProperty.title,
+  };
+}
+
 enum VisualEffect {
   none(0),
   blur(1),
@@ -197,6 +229,17 @@ final class WindowCloseRequestedEvent extends WindowEvent {
   final EventRequest request;
 }
 
+final class WindowPropertyChangedEvent extends WindowEvent {
+  const WindowPropertyChangedEvent({
+    required this.windowId,
+    required this.property,
+  });
+
+  @override
+  final WindowId windowId;
+  final WindowProperty property;
+}
+
 class Window {
   Window.fromHandle(this.nativeHandle);
   Window.borrowed(this.nativeHandle);

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

@@ -60,6 +60,41 @@ enum WindowCornerPreference {
       c.native_window_corner_preference_t.fromValue(value);
 }
 
+enum WindowProperty {
+  title(0),
+  resizable(1),
+  movable(2),
+  minimizable(3),
+  maximizable(4),
+  fullScreenable(5),
+  closable(6),
+  windowControlButtonsVisible(7),
+  alwaysOnTop(8),
+  alwaysOnBottom(9),
+  titleBarStyle(10);
+
+  const WindowProperty(this.value);
+  final int value;
+
+  static WindowProperty fromValue(int value) => switch (value) {
+    0 => WindowProperty.title,
+    1 => WindowProperty.resizable,
+    2 => WindowProperty.movable,
+    3 => WindowProperty.minimizable,
+    4 => WindowProperty.maximizable,
+    5 => WindowProperty.fullScreenable,
+    6 => WindowProperty.closable,
+    7 => WindowProperty.windowControlButtonsVisible,
+    8 => WindowProperty.alwaysOnTop,
+    9 => WindowProperty.alwaysOnBottom,
+    10 => WindowProperty.titleBarStyle,
+    _ => WindowProperty.title,
+  };
+
+  c.native_window_property_t get raw =>
+      c.native_window_property_t.fromValue(value);
+}
+
 enum VisualEffect {
   none(0),
   blur(1),
@@ -191,6 +226,18 @@ sealed class WindowEvent {
         request: EventRequest.borrowed(raw.data.close_requested.request),
       );
     }
+    if (raw.typeAsInt ==
+        c
+            .native_window_event_type_t
+            .NATIVE_WINDOW_EVENT_TYPE_PROPERTY_CHANGED
+            .value) {
+      return WindowPropertyChangedEvent(
+        windowId: raw.window_id,
+        property: WindowProperty.fromValue(
+          raw.data.property_changed.propertyAsInt,
+        ),
+      );
+    }
     return null;
   }
 }
@@ -285,6 +332,17 @@ final class WindowCloseRequestedEvent extends WindowEvent {
   final EventRequest request;
 }
 
+final class WindowPropertyChangedEvent extends WindowEvent {
+  const WindowPropertyChangedEvent({
+    required this.windowId,
+    required this.property,
+  });
+
+  @override
+  final WindowId windowId;
+  final WindowProperty property;
+}
+
 class Window {
   /// Adopts a handle returned by the C API and releases it when this
   /// object becomes unreachable.

bindings/js/lib/window.ts

@@ -25,6 +25,21 @@ export const WindowCornerPreference = {
 } as const;
 export type WindowCornerPreference = (typeof WindowCornerPreference)[keyof typeof WindowCornerPreference];
 
+export const WindowProperty = {
+  Title: 0,
+  Resizable: 1,
+  Movable: 2,
+  Minimizable: 3,
+  Maximizable: 4,
+  FullScreenable: 5,
+  Closable: 6,
+  WindowControlButtonsVisible: 7,
+  AlwaysOnTop: 8,
+  AlwaysOnBottom: 9,
+  TitleBarStyle: 10,
+} as const;
+export type WindowProperty = (typeof WindowProperty)[keyof typeof WindowProperty];
+
 export const VisualEffect = {
   None: 0,
   Blur: 1,
@@ -61,7 +76,8 @@ export type WindowEvent =
   | { type: "closed"; windowId: WindowId }
   | { type: "enteredFullScreen"; windowId: WindowId }
   | { type: "exitedFullScreen"; windowId: WindowId }
-  | { type: "closeRequested"; windowId: WindowId; request: EventRequest | null };
+  | { type: "closeRequested"; windowId: WindowId; request: EventRequest | null }
+  | { type: "propertyChanged"; windowId: WindowId; property: WindowProperty };
 
 /** A native Window, held through an owned handle. */
 export class Window extends NativeObject {

bindings/js/src/generated/types.h

@@ -472,6 +472,10 @@ inline Value ToValue(const native_window_event_t& event) {
       result.Set("type", Value::String("closeRequested"));
       result.Set("request", Value::BigInt(event.data.close_requested.request));
       break;
+    case NATIVE_WINDOW_EVENT_TYPE_PROPERTY_CHANGED:
+      result.Set("type", Value::String("propertyChanged"));
+      result.Set("property", Value::Number(static_cast<double>(event.data.property_changed.property)));
+      break;
     default:
       return Value::Null();
   }

bindings/python/nativeapi/__init__.py

@@ -196,6 +196,8 @@
     WindowMaximizedEvent,
     WindowMinimizedEvent,
     WindowMovedEvent,
+    WindowProperty,
+    WindowPropertyChangedEvent,
     WindowResizedEvent,
     WindowRestoredEvent,
 )
@@ -352,6 +354,8 @@
     "WindowMaximizedEvent",
     "WindowMinimizedEvent",
     "WindowMovedEvent",
+    "WindowProperty",
+    "WindowPropertyChangedEvent",
     "WindowResizedEvent",
     "WindowRestoredEvent",
     "WindowShadow",

bindings/python/nativeapi/_capi.py

@@ -137,6 +137,10 @@ class native_window_event_close_requested_t(Structure):
     pass
 
 
+class native_window_event_property_changed_t(Structure):
+    pass
+
+
 class native_window_event_data_t(Union):
     pass
 
@@ -417,10 +421,14 @@ class native_window_list_t(Structure):
 native_window_event_close_requested_t._fields_ = [
     ("request", c_uint64),
 ]
+native_window_event_property_changed_t._fields_ = [
+    ("property", c_int),
+]
 native_window_event_data_t._fields_ = [
     ("moved", native_window_event_moved_t),
     ("resized", native_window_event_resized_t),
     ("close_requested", native_window_event_close_requested_t),
+    ("property_changed", native_window_event_property_changed_t),
 ]
 native_window_event_t._fields_ = [
     ("type", c_int),