Skip to content

Commit

Permalink
Fix-freezing
Browse files Browse the repository at this point in the history
Bump ubuntu version in workflow
  • Loading branch information
haslinghuis committed May 11, 2022
1 parent af0f2aa commit 2cb90b1
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/artifact-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/hide-artifact-links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14.18.2
16.15.0
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'},
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion src/js/tabs/osd.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 2cb90b1

Please sign in to comment.