From 207ecfdde5a9b9185c364e21fe97c148b225a4e5 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Wed, 26 Oct 2022 21:20:47 +0200 Subject: [PATCH 1/2] Create ci.yml --- .github/workflows/ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..64f7b27 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,25 @@ +name: ci +on: pull_request +jobs: + linux: + uses: ChristopherHX/linux-packaging-scripts/.github/workflows/main.yml@main + with: + submodule-refs: |- + [ + { + "project": "mcpelauncher-ui", + "path": "mcpelauncher-ui-qt", + "ref": ${{ tojson(github.sha) }} + } + ] + macOS: + uses: ChristopherHX/osx-packaging-scripts/.github/workflows/main.yml@main + with: + submodule-refs: |- + [ + { + "project": "mcpelauncher-ui", + "path": "mcpelauncher-ui-qt", + "ref": ${{ tojson(github.sha) }} + } + ] From 4f3ddffeee5ba14768f0b6221957819a1c77cc08 Mon Sep 17 00:00:00 2001 From: ChristopherHX Date: Wed, 26 Oct 2022 21:21:31 +0200 Subject: [PATCH 2/2] Update launcherapp_osx.mm --- launcherapp_osx.mm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/launcherapp_osx.mm b/launcherapp_osx.mm index 51222eb..8189a08 100644 --- a/launcherapp_osx.mm +++ b/launcherapp_osx.mm @@ -3,8 +3,4 @@ #import void LauncherApp::setVisibleInDock(bool visible) { - if (!visible) - [NSApp setActivationPolicy: NSApplicationActivationPolicyAccessory]; - else - [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular]; -} \ No newline at end of file +}