diff --git a/.github/workflows/build-qv2ray-cmake.yml b/.github/workflows/build-qv2ray-cmake.yml index d35bddd..3320cf8 100644 --- a/.github/workflows/build-qv2ray-cmake.yml +++ b/.github/workflows/build-qv2ray-cmake.yml @@ -19,19 +19,19 @@ jobs: include: - cross_os: public_res cross_arch: public_res - go_version: "1.23.5" + go_version: "1.24" - cross_os: windows cross_arch: amd64 - go_version: "1.23.5" + go_version: "1.24" - cross_os: linux cross_arch: amd64 - go_version: "1.23.5" + go_version: "1.24" - cross_os: darwin cross_arch: amd64 - go_version: "1.23.5" + go_version: "1.24" - cross_os: darwin cross_arch: arm64 - go_version: "1.23.5" + go_version: "1.24" fail-fast: false runs-on: ubuntu-latest steps: @@ -73,16 +73,16 @@ jobs: matrix: include: - platform: windows-latest - qt_version: "6.8.1" + qt_version: "6.8.2" target: amd64 - platform: ubuntu-latest - qt_version: "6.8.1" + qt_version: "6.8.2" target: amd64 - platform: macos-latest - qt_version: "6.8.1" + qt_version: "6.8.2" target: x86_64 - platform: macos-latest - qt_version: "6.8.1" + qt_version: "6.8.2" target: arm64 fail-fast: false runs-on: ${{ matrix.platform }} diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index b7322a5..88bb57c 100644 --- a/src/ui/mainwindow.cpp +++ b/src/ui/mainwindow.cpp @@ -311,22 +311,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi trayMenu->addAction(ui->actionRestart_Program); trayMenu->addAction(ui->menu_exit); tray->show(); -#ifndef Q_OS_WIN tray->setContextMenu(trayMenu); -#else - // popup once so that its height is calculated - trayMenu->popup(QCursor::pos()); - trayMenu->hide(); -#endif connect(tray, &QSystemTrayIcon::activated, qApp, [=](QSystemTrayIcon::ActivationReason reason) { - if (reason == QSystemTrayIcon::Context) - { -#ifdef Q_OS_WIN - int mh = trayMenu->geometry().height(); - auto cPos = QCursor::pos(); - trayMenu->popup({cPos.x(), cPos.y()-mh}); -#endif - } if (reason == QSystemTrayIcon::Trigger) { if (this->isVisible()) { hide();