From 538689a8b3850aaba3cac20b86abcdaf9be36e9c Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Mon, 24 Jan 2022 23:09:59 +0200
Subject: [PATCH] Rollback titlebar change on macOS

---
 lib/main.dart                        | 2 +-
 lib/ui/app/main_screen.dart          | 2 +-
 macos/Runner/MainFlutterWindow.swift | 6 +-----
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index 25fb70d5e..588379f8c 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -135,7 +135,7 @@ void main({bool isTesting = false}) async {
     );
   }
 
-  if (isDesktopOS()) {
+  if (isDesktopOS() && !isMacOS()) {
     doWhenWindowReady(() {
       final win = appWindow;
       win.title = 'Invoice Ninja';
diff --git a/lib/ui/app/main_screen.dart b/lib/ui/app/main_screen.dart
index 0adb6fdd6..dcdda47aa 100644
--- a/lib/ui/app/main_screen.dart
+++ b/lib/ui/app/main_screen.dart
@@ -296,7 +296,7 @@ class MainScreen extends StatelessWidget {
               policy: ReadingOrderTraversalPolicy(),
               child: Column(
                 children: [
-                  if (isDesktopOS()) AppTitleBar(),
+                  if (isDesktopOS() && !isMacOS()) AppTitleBar(),
                   Expanded(
                     child: ChangeLayoutBanner(
                       appLayout: prefState.appLayout,
diff --git a/macos/Runner/MainFlutterWindow.swift b/macos/Runner/MainFlutterWindow.swift
index b405e4f73..2722837ec 100644
--- a/macos/Runner/MainFlutterWindow.swift
+++ b/macos/Runner/MainFlutterWindow.swift
@@ -1,11 +1,7 @@
 import Cocoa
 import FlutterMacOS
-import bitsdojo_window_macos
 
-class MainFlutterWindow: BitsdojoWindow {
-  override func bitsdojo_window_configure() -> UInt {
-    return BDW_CUSTOM_FRAME | BDW_HIDE_ON_STARTUP
-  }
+class MainFlutterWindow: NSWindow {
   override func awakeFromNib() {
     let flutterViewController = FlutterViewController.init()
     let windowFrame = self.frame