Merge pull request #62 from parkerhutchinson/feature/add-minimize

Add missing minimize window events

Author: Adrian-Samoticha

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 1.8.0
+- Add `miniaturizeWindow` method (thanks [@parkerhutchinson](https://github.com/parkerhutchinson)).
+
 ## 1.7.1
 - Fix nil being found when unwrapping an Optional value when `reset` is called before `start` in `MainFlutterWindowManipulator.swift`.
 

example/lib/main_area/ns_window_delegate_demo/event_delegate.dart

@@ -61,6 +61,14 @@ class EventDelegate extends NSWindowDelegate {
     super.windowDidEndLiveResize();
   }
 
+  @override
+  void windowShouldMiniaturize() {
+    final event = NSWindowDelegateEvent(name: 'windowShouldMiniaturize');
+    eventHandler.addEvent(event);
+
+    super.windowShouldMiniaturize();
+  }
+
   @override
   void windowWillMiniaturize() {
     final event = NSWindowDelegateEvent(name: 'windowWillMiniaturize');

example/lib/main_area/window_manipulator_demo/command_list_provider/command_list_provider.dart

@@ -106,6 +106,12 @@ class CommandListProvider {
         name: 'showZoomButton()',
         function: () => WindowManipulator.showZoomButton(),
       ),
+      Command(
+        name: 'miniaturizeWindow()',
+        description: 'Removes the window from the screen list and displays the '
+            'minimized window in the Dock.',
+        function: () => WindowManipulator.miniaturizeWindow(),
+      ),
       Command(
         name: 'hideMiniaturizeButton()',
         function: () => WindowManipulator.hideMiniaturizeButton(),

lib/macos/ns_window_delegate.dart

@@ -51,6 +51,9 @@ abstract class NSWindowDelegate {
 
   // === Minimizing Windows ===
 
+  /// Tells the delegate that the window should minimize
+  void windowShouldMiniaturize() {}
+
   /// Tells the delegate that the window is about to be minimized.
   void windowWillMiniaturize() {}
 

lib/ns_window_delegate_handler/ns_window_delegate_handler.dart

@@ -50,6 +50,12 @@ class NSWindowDelegateHandler {
           }
           return null;
 
+        case "windowShouldMiniaturize":
+          for (final delegate in delegates.values) {
+            delegate.windowShouldMiniaturize();
+          }
+          return null;
+
         case "windowWillMiniaturize":
           for (final delegate in delegates.values) {
             delegate.windowWillMiniaturize();

lib/window_manipulator.dart

@@ -205,6 +205,12 @@ class WindowManipulator {
     await _windowManipulatorMethodChannel.invokeMethod('showZoomButton');
   }
 
+  /// Minimizes the current window into the task bar.
+  static Future<void> miniaturizeWindow() async {
+    await _completer.future;
+    await _windowManipulatorMethodChannel.invokeMethod('miniaturizeWindow');
+  }
+
   /// Hides the window's miniaturize button.
   static Future<void> hideMiniaturizeButton() async {
     await _completer.future;

macos/Classes/FlutterWindowDelegate.swift

@@ -12,6 +12,7 @@ class FlutterWindowDelegate: NSObject, NSWindowDelegate {
     private var methodChannel: FlutterMethodChannel?
     private var fullScreenPresentationOptions: NSApplication.PresentationOptions?
     public var windowShouldCloseReturnValue: Bool = true
+    public var windowShouldMiniaturizeReturnValue: Bool = true
 
     public static func create(window: NSWindow, methodChannel: FlutterMethodChannel) -> FlutterWindowDelegate {
         let newDelegate = FlutterWindowDelegate()
@@ -65,6 +66,12 @@ class FlutterWindowDelegate: NSObject, NSWindowDelegate {
 
     // Minimizing Windows
 
+    func windowShouldMiniaturize(_ sender: NSWindow) -> Bool {
+        methodChannel!.invokeMethod("windowShouldMiniaturize", arguments: nil)
+        
+        return windowShouldMiniaturizeReturnValue
+    }
+
     func windowWillMiniaturize(_ notification: Notification) {
         methodChannel!.invokeMethod("windowWillMiniaturize", arguments: nil)
     }

macos/Classes/MacOSWindowUtilsPlugin.swift

@@ -161,6 +161,11 @@ public class MacOSWindowUtilsPlugin: NSObject, FlutterPlugin {
             result(true)
             break
 
+        case "miniaturizeWindow":
+            MainFlutterWindowManipulator.miniaturizeWindow()
+            result(true)
+            break
+
         case "hideMiniaturizeButton":
             MainFlutterWindowManipulator.hideMiniaturizeButton()
             result(true)

macos/Classes/MainFlutterWindowManipulator.swift

@@ -182,7 +182,15 @@ public class MainFlutterWindowManipulator {
 
         self.mainFlutterWindow!.standardWindowButton(.zoomButton)!.isHidden = false
     }
-    
+
+    public static func miniaturizeWindow() {
+        if (self.mainFlutterWindow == nil) {
+            start(mainFlutterWindow: nil)
+        }
+        
+        mainFlutterWindow?.miniaturize(nil)
+    }
+
     public static func hideMiniaturizeButton() {
         if (self.mainFlutterWindow == nil) {
             start(mainFlutterWindow: nil)

pubspec.yaml

@@ -2,7 +2,7 @@ name: macos_window_utils
 description:
   macos_window_utils is a Flutter package that provides a set of methods for
   modifying the NSWindow of a Flutter application on macOS.
-version: 1.7.1
+version: 1.8.0
 repository: https://github.com/Adrian-Samoticha/macos_window_utils.dart
 
 environment: