Full screen opaque toolbar issue (closes macosui#249) (macosui#252)

* fix: don't show app window toolbar when in full screen

* chore: update README

* chore: update brick app window code

* chore: update pubspec and changelog

* chore: update actions

Co-authored-by: Reuben Turner <[email protected]>

.github/workflows/dart_code_metrics.yaml

@@ -0,0 +1,20 @@
+name: Dart Code Metrics
+on: [pull_request, workflow_dispatch]
+
+jobs:
+  dart-code-metrics:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install Flutter
+        uses: subosito/flutter-action@master
+        with:
+          channel: stable
+
+      - name: Check directory
+        run: ls
+      - name: Install Code Metrics
+        run: flutter pub global activate dart_code_metrics
+      - name: Run Code Metrics
+        run: flutter pub global run dart_code_metrics:metrics --reporter=github lib

.github/workflows/pana_analysis.yml

@@ -2,8 +2,8 @@ name: Pana Analysis
 on: [pull_request, workflow_dispatch]
 
 jobs:
-  package-analysis:
-    runs-on: ubuntu-latest
+  pana-analysis:
+    runs-on: macos-latest
 
     steps:
       - uses: actions/checkout@v2
@@ -12,40 +12,23 @@ jobs:
         with:
           channel: stable
 
-      #- name: Install dependencies
-      #  run: flutter pub get
+      - name: Analyze package with Pana
+        run: |
+          flutter pub global activate pana 0.21.5
 
-      - name: Check directory
-        run: ls
-      - name: Install Code Metrics
-        run: flutter pub global activate dart_code_metrics
-      - name: Run Code Metrics
-        run: flutter pub global run dart_code_metrics:metrics --reporter=github lib
+          REQUIRED_RATIO=1.0
+          TEMP_FILE=/tmp/pana_results.txt
 
-      - uses: axel-op/dart-package-analyzer@v3
-        # set an id for the current step
-        id: analysis
-        with:
-          githubToken: ${{ secrets.GITHUB_TOKEN }}
+          # Run pana, piping the output to both stderr and into a grep to find the result in the last line.
+          pana --no-warning | tee /dev/stderr | tail -1 | grep -o -E '[0-9]+' > $TEMP_FILE
 
-      # You can then use this id to retrieve the outputs in the next steps.
-      # The following step shows how to exit the workflow with an error if the total score in percentage is below 50:
-      - name: Check scores
-        env:
-          # NB: "analysis" is the id set above. Replace it with the one you used if different.
-          TOTAL: ${{ steps.analysis.outputs.total }}
-          TOTAL_MAX: ${{ steps.analysis.outputs.total_max }}
-        run: |
-          PERCENTAGE=$(( $TOTAL * 100 / $TOTAL_MAX ))
-          if (( $PERCENTAGE < 80 ))
-          then
-            echo Score too low!
+          # Extract score and calculate ratio.
+          SCORE=$(cat $TEMP_FILE | head -1)
+          TOTAL=$(cat $TEMP_FILE | tail -1)
+          RATIO=$(echo "scale=2; $SCORE / $TOTAL" | bc -l)
+          MEETS_REQUIRED_RATIO=$(echo "$RATIO >= $REQUIRED_RATIO" | bc -l)
+
+          if [[ "$MEETS_REQUIRED_RATIO" != "1" ]]; then
+            echo "Score of $SCORE out of $TOTAL is a ratio of $RATIO, which is not sufficient to meet the required ratio of $REQUIRED_RATIO"
             exit 1
           fi
-
-      # This step is useful for PR's coming from forks. It takes the raw JSON and formats a report from it.
-      - name: Format scores json
-        env:
-          JSON_OUTPUT: ${{ steps.analysis.outputs.json_output }}
-        run: |
-          TOTAL_SCORE=$(jq -r '.scores.grantedPoints' <<< "$JSON_OUTPUT")

CHANGELOG.md

@@ -1,3 +1,6 @@
+## [1.4.1]
+* Fixes an issue where if the app was displayed in full screen mode, an opaque empty toolbar would appear at the top [#249](https://github.com/GroovinChip/macos_ui/issues/249) 
+
 ## [1.4.0]
 * Migration to Flutter 3.0
   * Minimum dart sdk version is now 2.17.0

README.md

@@ -187,8 +187,9 @@ class BlurryContainerViewController: NSViewController {
   }
 }
 
-class MainFlutterWindow: NSWindow {
+class MainFlutterWindow: NSWindow, NSWindowDelegate {
   override func awakeFromNib() {
+    delegate = self
     let blurryContainerViewController = BlurryContainerViewController()
     let windowFrame = self.frame
     self.contentViewController = blurryContainerViewController
@@ -218,9 +219,16 @@ class MainFlutterWindow: NSWindow {
   }
 
   func window(_ window: NSWindow, willUseFullScreenPresentationOptions proposedOptions: NSApplication.PresentationOptions = []) -> NSApplication.PresentationOptions {
-    // Hides the toolbar when in fullscreen mode
     return [.autoHideToolbar, .autoHideMenuBar, .fullScreen]
   }
+
+  func windowWillEnterFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = false
+  }
+
+  func windowDidExitFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = true
+  }
 }
 
 ```

example/macos/Runner/MainFlutterWindow.swift

@@ -34,8 +34,9 @@ class BlurryContainerViewController: NSViewController {
   }
 }
 
-class MainFlutterWindow: NSWindow {
+class MainFlutterWindow: NSWindow, NSWindowDelegate {
   override func awakeFromNib() {
+    delegate = self
     let blurryContainerViewController = BlurryContainerViewController()
     let windowFrame = self.frame
     self.contentViewController = blurryContainerViewController
@@ -64,8 +65,17 @@ class MainFlutterWindow: NSWindow {
     super.awakeFromNib()
   }
 
+  // Hides the toolbar when in fullscreen mode
   func window(_ window: NSWindow, willUseFullScreenPresentationOptions proposedOptions: NSApplication.PresentationOptions = []) -> NSApplication.PresentationOptions {
-    // Hides the toolbar when in fullscreen mode
+
     return [.autoHideToolbar, .autoHideMenuBar, .fullScreen]
   }
+
+  func windowWillEnterFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = false
+  }
+
+  func windowDidExitFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = true
+  }
 }

example/pubspec.lock

@@ -87,7 +87,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "1.4.0"
+    version: "1.4.1"
   matcher:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,6 +1,6 @@
 name: macos_ui
 description: Flutter widgets and themes implementing the current macOS design language.
-version: 1.4.0
+version: 1.4.1
 homepage: "https://github.com/GroovinChip/macos_ui"
 
 environment:

starter_app/bricks/macosui_starter/__brick__/macos/Runner/MainFlutterWindow.swift

@@ -34,8 +34,9 @@ class BlurryContainerViewController: NSViewController {
   }
 }
 
-class MainFlutterWindow: NSWindow {
+class MainFlutterWindow: NSWindow, NSWindowDelegate {
   override func awakeFromNib() {
+    delegate = self
     let blurryContainerViewController = BlurryContainerViewController()
     let windowFrame = self.frame
     self.contentViewController = blurryContainerViewController
@@ -69,6 +70,14 @@ class MainFlutterWindow: NSWindow {
     // Hides the toolbar when in fullscreen mode
     return [.autoHideToolbar, .autoHideMenuBar, .fullScreen]
   }
+
+  func windowWillEnterFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = false
+  }
+
+  func windowDidExitFullScreen(_ notification: Notification) {
+      self.toolbar?.isVisible = true
+  }
 }
 {{/use_translucency}}{{^use_translucency}}
 class MainFlutterWindow: NSWindow {