diff --git a/src/main.cpp b/src/main.cpp index 06e3d529..580f3690 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -35,8 +35,7 @@ int main(int argc, char *argv[]) { QApplication::setAttribute(Qt::AA_Use96Dpi, true); #ifdef Q_OS_WIN32 - // QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); - QApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); + QApplication::setAttribute(Qt::AA_DisableHighDpiScaling, true); #endif // QApplication::setAttribute(Qt::AA_UseSoftwareOpenGL, true); QApplication a(argc, argv); diff --git a/src/widgets/basewindow.cpp b/src/widgets/basewindow.cpp index cf55d39a..439d6100 100644 --- a/src/widgets/basewindow.cpp +++ b/src/widgets/basewindow.cpp @@ -144,12 +144,12 @@ void BaseWindow::init() layout->addWidget(this->ui_.layoutBase); } - // DPI - auto dpi = util::getWindowDpi(this->winId()); +// DPI +// auto dpi = util::getWindowDpi(this->winId()); - if (dpi) { - this->scale = dpi.value() / 96.f; - } +// if (dpi) { +// this->scale = dpi.value() / 96.f; +// } #endif #ifdef USEWINSDK @@ -418,10 +418,16 @@ bool BaseWindow::nativeEvent(const QByteArray &eventType, void *message, long *r float _scale = dpi / 96.f; - auto *prcNewWindow = reinterpret_cast(msg->lParam); - SetWindowPos(msg->hwnd, nullptr, prcNewWindow->left, prcNewWindow->top, - prcNewWindow->right - prcNewWindow->left, - prcNewWindow->bottom - prcNewWindow->top, SWP_NOZORDER | SWP_NOACTIVATE); + static bool firstResize = true; + + if (!firstResize) { + auto *prcNewWindow = reinterpret_cast(msg->lParam); + SetWindowPos(msg->hwnd, nullptr, prcNewWindow->left, prcNewWindow->top, + prcNewWindow->right - prcNewWindow->left, + prcNewWindow->bottom - prcNewWindow->top, + SWP_NOZORDER | SWP_NOACTIVATE); + } + firstResize = false; this->nativeScale_ = _scale; this->updateScale();