2
0
forked from Ivasoft/DSView

fix combobox's bug at macos

This commit is contained in:
dreamsourcelabTAI
2021-11-23 13:35:08 +08:00
parent c7a6ce2ef5
commit 0368988a8c
45 changed files with 506 additions and 145 deletions

14
DSView/pv/mainwindow.cpp Executable file → Normal file
View File

@@ -39,6 +39,11 @@
#include <QScreen>
#include <QApplication>
#include <QStandardPaths>
#include <QScreen>
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <QGuiApplication>
#endif
#include "mainwindow.h"
@@ -867,7 +872,14 @@ void MainWindow::on_screenShot()
{
AppConfig &app = AppConfig::Instance();
QString default_name = app._userHistory.screenShotPath + "/DSView" + QDateTime::currentDateTime().toString("-yyMMdd-hhmmss");
QPixmap pixmap = QPixmap::grabWindow(winId());
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QScreen *scr = QGuiApplication::primaryScreen();
QPixmap pixmap = scr->grabWindow(winId());
#else
QPixmap pixmap = QPixmap::grabWindow(winId());
#endif
QString format = "png";
QString fileName = QFileDialog::getSaveFileName(