Merge branch 'master' of https://github.com/lacymorrow/crossover

* 'master' of https://github.com/lacymorrow/crossover:
  Update readme.md
  done
  git fuck
  package

.circleci/config.yml

@@ -15,6 +15,11 @@ jobs:
       - checkout
       - run:
           command: pwd
+      - node/install:
+          install-yarn: true
+          node-version: "14.21.3"
+      - run:
+          command: node --version
       - run:
           command: npm i --openssl-fips=''
       # - node/install-packages:
@@ -59,7 +64,7 @@ jobs:
           command: pwd
       - node/install:
           install-yarn: true
-          node-version: "16.20.0"
+          node-version: "14.21.3"
       # AT SOME POINT YARN INSTALL BROKE FOR NO REASON, TRY SWITCHING BACK TO YARN TO SEE IF IT WORKS
       # - node/install-packages:
       #     # If you are using yarn, change the line below from "npm" to "yarn"

.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

.nvmrc

@@ -1 +1 @@
-16
+14 || 16

appveyor.yml

@@ -17,7 +17,7 @@ branches:
 skip_tags: true
 
 environment:
-  nodejs_version: "16.20.0"
+  nodejs_version: "14.21.3"
 
 cache:
   - node_modules -> package.json

package.json

@@ -13,6 +13,13 @@
 		"email": "me@lacymorrow.com",
 		"url": "https://lacymorrow.com"
 	},
+	"contributors": [
+		{
+			"name": "Lacy Morrow",
+			"email": "me@lacymorrow.com",
+			"url": "https://github.com/lacymorrow"
+		}
+	],
 	"funding": [
 		{
 			"type": "patreon",
@@ -30,13 +37,13 @@
 	},
 	"license": "CC-BY-NC-SA-4.0",
 	"engines": {
-		"node": "14|| 16 ||18"
+		"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",
@@ -47,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",
@@ -65,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",

readme.md

@@ -455,7 +455,9 @@ Then edit the automatically created GitHub Releases draft and publish.
 
 Fullscreen for MacOS may have better results.
 
-#### Workaround
+##### Workaround using AutoHotKey (Windows)
+
+> via [@girkovarpa](https://github.com/lacymorrow/crossover/issues/47#issuecomment-805017469)
 
 If you absolutely need to use `Fullscreen` mode, or your game is not supported by crossover, there is a workaround using [AutoHotKey](https://www.autohotkey.com/).
 
@@ -469,7 +471,9 @@ Home::Winset, Alwaysontop, , CrossOver
 
 Once in-game, pressing space should put the crosshair over the screen, even in fullscreen mode.
 
-> via [@girkovarpa](https://github.com/lacymorrow/crossover/issues/47#issuecomment-805017469)
+### Performance Issues
+
+There are reports of stuttering when using V-SYNC, G-SYNC, or similar Adaptive Sync ([#330](https://github.com/lacymorrow/crossover/issues/330)). Disabling these may improve performance.  s
 
 ### Graphical issues on Linux
 

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 () => {