From b6d4a224dafb59c76e91b9766ba930cb7e80dc6c Mon Sep 17 00:00:00 2001
From: Lacy Morrow <me@lacymorrow.com>
Date: Thu, 18 Jan 2024 15:54:54 -0500
Subject: [PATCH] done

---
 .circleci/parallel-config.yml | 14 +++++++-------
 .nvmrc                        |  2 +-
 package.json                  | 14 +++++++-------
 src/main.js                   |  3 +++
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.circleci/parallel-config.yml b/.circleci/parallel-config.yml
index 2d39bbda..f0efdfef 100644
--- a/.circleci/parallel-config.yml
+++ b/.circleci/parallel-config.yml
@@ -45,10 +45,10 @@ jobs:
           # command: HOMEBREW_NO_AUTO_UPDATE=1 brew install snapcraft rpm
       - node/install-packages:
           # If you are using yarn, change the line below from "npm" to "yarn"
-          pkg-manager: yarn
+          pkg-manager: npm
       # - run:
       #     name: Install Node Modules
-      #     command: yarn --skip-integrity-check --network-timeout 300000
+      #     command: npm run --skip-integrity-check --network-timeout 300000
       - persist_to_workspace:
           # Must be an absolute path, or relative path from working_directory. This is a directory on the container which is
           # taken to be the root directory of the workspace.
@@ -65,7 +65,7 @@ jobs:
           at: /tmp/crossover
       - run:
           name: Run snap
-          command: yarn build:snap
+          command: npm run build:snap
 
   build_linux:
     executor: macos-executor
@@ -75,7 +75,7 @@ jobs:
           at: /tmp/crossover
       - run:
           name: Run snap
-          command: yarn build:linux
+          command: npm run build:linux
 
   build_windows:
     executor: macos-executor
@@ -85,10 +85,10 @@ jobs:
           at: /tmp/crossover
       - run:
           name: Run windows
-          command: yarn build:windows
+          command: npm run build:windows
       - run:
           name: Create Windows EXE
-          command: yarn sh:copyexe
+          command: npm run sh:copyexe
 
   build_mac:
     executor: macos-executor
@@ -98,7 +98,7 @@ jobs:
           at: /tmp/crossover
       - run:
           name: Run mac
-          command: yarn build:mac
+          command: npm run build:mac
 
   cleanup:
     executor: macos-executor
diff --git a/.nvmrc b/.nvmrc
index b6a7d89c..6c54ceb1 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-16
+14 || 16
diff --git a/package.json b/package.json
index 18c3c2e2..f5e1ee8a 100644
--- a/package.json
+++ b/package.json
@@ -40,10 +40,10 @@
 		"node": "14"
 	},
 	"scripts": {
-		"install": "yarn css",
+		"install": "npm run css",
 		"postinstall": "electron-builder install-app-deps",
 		"css": "sass src/renderer/styles/index.scss:src/renderer/styles/dist/index.css src/renderer/styles/preferences.scss:src/renderer/styles/dist/preferences.css -s compressed",
-		"start": "yarn css && electron --disable-gpu-sandbox --trace-warnings .",
+		"start": "npm run css && electron --disable-gpu-sandbox --trace-warnings .",
 		"watch": "nodemon -e js,ts,scss --ignore 'dist/' --watch . --exec 'npm run start'",
 		"lint": "eslint --fix .",
 		"lint:src": "eslint --fix src",
@@ -54,7 +54,7 @@
 		"test:debug:console": "PWDEBUG=console CI=1 playwright test",
 		"check:deps": "depcheck --ignores=bindings,electron-builder-squirrel-windows,electron-reloader,sass --ignore-dirs=build,dist",
 		"check:circular": "madge --circular .",
-		"depcheck": "yarn check:deps && yarn check:circular",
+		"depcheck": "npm run check:deps && npm run check:circular",
 		"release": "np --no-tests --branch release",
 		"release:snap": "snapcraft upload --release=CrossOver*.snap",
 		"pack": "rm -f *.tgz && electron-builder --dir",
@@ -72,12 +72,12 @@
 		"build:deb": "electron-builder --linux deb",
 		"build:rpm": "electron-builder --linux rpm",
 		"build:snap": "electron-builder --linux snap",
-		"build:release": "rm -rf dist && yarn build:mac && yarn build:wl && yarn build:snap && yarn sh:copyexe",
-		"build:release:snap": "electron-builder --linux snap && yarn snap:release",
-		"build:release:windows": "yarn build:windows && yarn sh:copyexe",
+		"build:release": "rm -rf dist && npm run build:mac && npm run build:wl && npm run build:snap && npm run sh:copyexe",
+		"build:release:snap": "electron-builder --linux snap && npm run snap:release",
+		"build:release:windows": "npm run build:windows && npm run sh:copyexe",
 		"snap:login:export": "snapcraft export-login --snaps crossover --channels edge,stable -",
 		"snap:release": "snapcraft upload --release=stable dist/*.snap",
-		"upgrade:interactive": "yarn upgrade-interactive --latest"
+		"upgrade:interactive": "npm run upgrade-interactive --latest"
 	},
 	"dependencies": {
 		"electron-debug": "^3.2.0",
diff --git a/src/main.js b/src/main.js
index 86593bb5..6932d8e4 100644
--- a/src/main.js
+++ b/src/main.js
@@ -73,6 +73,7 @@ const init = require( './main/init.js' )
 const reset = require( './main/reset.js' )
 const tray = require( './main/tray.js' )
 const { appId } = require( '../package.json' )
+const { menuBarHeight } = require( 'electron-util' )
 
 const start = async () => {
 
@@ -180,6 +181,8 @@ const ready = async () => {
 
 	console.timeEnd( 'init' )
 
+	console.log( menuBarHeight() )
+
 }
 
 module.exports = async () => {