Merge pull request #2913 from haslinghuis/fix-freezing

Fix freezing of configurator while loading local firmware and OSD preview while moving elements on Linux

Author: haslinghuis

.github/workflows/artifact-links.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   artifacts-url-comments:
     name: Add artifact links to PR and issues
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Add artifact links to PR and issues
         uses: tonyhallett/[email protected]

.github/workflows/build-release.yml

@@ -16,7 +16,7 @@ jobs:
   release:
     name: Attach Release Artifacts
     needs: ci
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Code Checkout
         uses: actions/checkout@v2

.github/workflows/hide-artifact-links.yml

@@ -7,7 +7,7 @@ on:
 jobs:
   hide-artifacts-link-comments:
     name: Hide artifact links
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Hide comments
         uses: int128/hide-comment-action@v1

.github/workflows/nightly.yml

@@ -30,7 +30,7 @@ jobs:
   release:
     name: Nightly release
     needs: ci
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Fetch build artifacts
         uses: actions/download-artifact@v2

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
   release:
     name: Release
     needs: ci
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Fetch build artifacts
         uses: actions/download-artifact@v2

.nvmrc

@@ -1 +1 @@
-14.18.2
+16.15.0

gulpfile.js

@@ -48,7 +48,7 @@ const NODE_ENV = process.env.NODE_ENV || 'production';
 const NAME_REGEX = /-/g;
 
 const nwBuilderOptions = {
-    version: os.platform() === 'linux' ? '0.54.1' : '0.60.0',    // linux has a bug with moving OSD elements
+    version: '0.62.0',
     files: `${DIST_DIR}**/*`,
     macIcns: './src/images/bf_icon.icns',
     macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},

package.json

@@ -48,7 +48,7 @@
   "author": "The Betaflight open source project.",
   "license": "GPL-3.0",
   "engines": {
-    "node": "14.x"
+    "node": "16.x"
   },
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",

src/js/tabs/osd.js

@@ -2352,7 +2352,11 @@ OSD.GUI.preview = {
         ev.dataTransfer.setData("text/plain", $(ev.target).data('field').index);
         ev.dataTransfer.setData("x", ev.currentTarget.dataset.x);
         ev.dataTransfer.setData("y", ev.currentTarget.dataset.y);
-        ev.dataTransfer.setDragImage($(this).data('field').preview_img, offsetX, offsetY);
+
+        if (GUI.operating_system !== "Linux") {
+            // latest NW.js (0.6x.x) has introduced an issue with Linux displaying a rectangle while moving an element
+            ev.dataTransfer.setDragImage($(this).data('field').preview_img, offsetX, offsetY);
+        }
     },
     onDragOver(e) {
         const ev = e.originalEvent;