Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-09 03:52:19 +02:00
Code Activity

Made DPI dynamic to fix errors where running on Win7 failed

Browse source
This commit is contained in:
Brian Fiete 2019-09-18 08:15:17 -07:00
parent c0b73cdd6f
commit cde78bc8c5
2 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

17
BeefySysLib/platform/win/WinBFApp.cpp
View file

@ -1016,12 +1016,22 @@ static int WinBFReportHook( int reportType, char *message, int *returnValue )
extern HINSTANCE gDLLInstance; extern HINSTANCE gDLLInstance;
typedef UINT(NTAPI *GetDpiForWindow_t)(HWND);
static GetDpiForWindow_t gGetDpiForWindow = NULL;
static HMODULE gUserDll = NULL;
WinBFApp::WinBFApp() WinBFApp::WinBFApp()
{ {
#ifndef BF_MINGW #ifndef BF_MINGW
//_CrtSetReportHook(WinBFReportHook); //_CrtSetReportHook(WinBFReportHook);
#endif #endif
if (gUserDll == NULL)
{
gUserDll = ::LoadLibraryA("user32.dll");
gGetDpiForWindow = (GetDpiForWindow_t)::GetProcAddress(gUserDll, "GetDpiForWindow");
}
mRunning = false; mRunning = false;
mRenderDevice = NULL; mRenderDevice = NULL;
@ -1341,6 +1351,13 @@ bool WinBFWindow::IsMouseCaptured()
return (mHWnd != NULL) && (GetCapture() == mHWnd); return (mHWnd != NULL) && (GetCapture() == mHWnd);
} }
int WinBFWindow::GetDPI()
{
if (gGetDpiForWindow != NULL)
return (int)gGetDpiForWindow(mHWnd);
return 96; // Default DPI
}
uint32 WinBFApp::GetClipboardFormat(const StringImpl& format) uint32 WinBFApp::GetClipboardFormat(const StringImpl& format)
{ {
if (format == "text") if (format == "text")

2
BeefySysLib/platform/win/WinBFApp.h
View file

@ -75,7 +75,7 @@ public:
virtual void SetAlpha(float alpha, uint32 destAlphaSrcMask, bool isMouseVisible) override; virtual void SetAlpha(float alpha, uint32 destAlphaSrcMask, bool isMouseVisible) override;
virtual void CaptureMouse() override; virtual void CaptureMouse() override;
virtual bool IsMouseCaptured() override; virtual bool IsMouseCaptured() override;
virtual int GetDPI() { return ::GetDpiForWindow(mHWnd); } virtual int GetDPI() override; // { return ::GetDpiForWindow(mHWnd); }
virtual BFMenu* AddMenuItem(BFMenu* parent, int insertIdx, const char* text, const char* hotKey, BFSysBitmap* bitmap, bool enabled, int checkState, bool radioCheck) override; virtual BFMenu* AddMenuItem(BFMenu* parent, int insertIdx, const char* text, const char* hotKey, BFSysBitmap* bitmap, bool enabled, int checkState, bool radioCheck) override;
virtual void ModifyMenuItem(BFMenu* item, const char* text, const char* hotKey, BFSysBitmap* bitmap, bool enabled, int checkState, bool radioCheck) override; virtual void ModifyMenuItem(BFMenu* item, const char* text, const char* hotKey, BFSysBitmap* bitmap, bool enabled, int checkState, bool radioCheck) override;