parent
942fd02b66
commit
6bbbc0a145
|
@ -39,8 +39,10 @@
|
|||
#endif
|
||||
#include "qwinregistry_p.h"
|
||||
#include "framelesshelper_windows.h"
|
||||
#if 0
|
||||
#include <atlbase.h>
|
||||
#include <d2d1_1.h>
|
||||
#include <d2d1.h>
|
||||
#endif
|
||||
|
||||
Q_DECLARE_METATYPE(QMargins)
|
||||
|
||||
|
@ -607,11 +609,12 @@ quint32 Utilities::getPrimaryScreenDpi(const bool horizontal)
|
|||
}
|
||||
}
|
||||
}
|
||||
#if 0 // Crash on Windows 7, to be investigated.
|
||||
static const auto pD2D1CreateFactory =
|
||||
reinterpret_cast<HRESULT(WINAPI *)(D2D1_FACTORY_TYPE, REFIID, void **)>(
|
||||
QSystemLibrary::resolve(QStringLiteral("d2d1"), "D2D1CreateFactory"));
|
||||
if (pD2D1CreateFactory) {
|
||||
CComPtr<ID2D1Factory1> d2dFactory = nullptr;
|
||||
CComPtr<ID2D1Factory> d2dFactory = nullptr;
|
||||
if (SUCCEEDED(pD2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, IID_PPV_ARGS(&d2dFactory)))) {
|
||||
if (SUCCEEDED(d2dFactory->ReloadSystemMetrics())) {
|
||||
FLOAT dpiX = 0.0, dpiY = 0.0;
|
||||
|
@ -623,6 +626,7 @@ QT_WARNING_POP
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
const HDC hdc = GetDC(nullptr);
|
||||
if (hdc) {
|
||||
const int dpiX = GetDeviceCaps(hdc, LOGPIXELSX);
|
||||
|
|
Loading…
Reference in New Issue