Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DPI Aware wxGetSystemMetrics

Browse Source 
If no wxWindow is known, use wxTheApp->GetTopWindow().
Also use a wxWindow for all wxSystemSettings::GetMetric calls.
This commit is contained in:
Maarten Bent
2018-07-22 14:16:51 +02:00
parent 04b99d54bd
commit f74d756ca5
37 changed files with 106 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/msw/menuitem.cpp
View File

@@ -126,10 +126,10 @@ private:
int m_modeOld;
};
inline bool IsGreaterThanStdSize(const wxBitmap& bmp)
inline bool IsGreaterThanStdSize(const wxBitmap& bmp, const wxWindow* win)
{
return bmp.GetWidth() > ::GetSystemMetrics(SM_CXMENUCHECK) ||
bmp.GetHeight() > ::GetSystemMetrics(SM_CYMENUCHECK);
return bmp.GetWidth() > wxGetSystemMetrics(SM_CXMENUCHECK, win) ||
bmp.GetHeight() > wxGetSystemMetrics(SM_CYMENUCHECK, win);
}
} // anonymous namespace
@@ -306,9 +306,9 @@ MenuDrawData* MenuDrawData::ms_instance = NULL;
void MenuDrawData::Init()
{
#if wxUSE_UXTHEME
const wxWindow* window = wxTheApp ? wxTheApp->GetTopWindow() : NULL;
if ( IsUxThemeActive() )
{
wxWindow* window = static_cast<wxApp*>(wxApp::GetInstance())->GetTopWindow();
wxUxThemeHandle hTheme(window, L"MENU");
::GetThemeMargins(hTheme, NULL, MENU_POPUPITEM, 0,
@@ -366,12 +366,12 @@ void MenuDrawData::Init()
const NONCLIENTMETRICS& metrics = wxMSWImpl::GetNonClientMetrics();
CheckMargin.cxLeftWidth =
CheckMargin.cxRightWidth = ::GetSystemMetrics(SM_CXEDGE);
CheckMargin.cxRightWidth = wxGetSystemMetrics(SM_CXEDGE, window);
CheckMargin.cyTopHeight =
CheckMargin.cyBottomHeight = ::GetSystemMetrics(SM_CYEDGE);
CheckMargin.cyBottomHeight = wxGetSystemMetrics(SM_CYEDGE, window);
CheckSize.cx = ::GetSystemMetrics(SM_CXMENUCHECK);
CheckSize.cy = ::GetSystemMetrics(SM_CYMENUCHECK);
CheckSize.cx = wxGetSystemMetrics(SM_CXMENUCHECK, window);
CheckSize.cy = wxGetSystemMetrics(SM_CYMENUCHECK, window);
ArrowSize = CheckSize;
@@ -1293,8 +1293,9 @@ bool wxMenuItem::MSWMustUseOwnerDrawn()
const wxBitmap& bmpUnchecked = GetBitmap(false),
bmpChecked = GetBitmap(true);
if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked)) ||
(bmpChecked.IsOk() && IsGreaterThanStdSize(bmpChecked)) ||
const wxWindow* win = m_parentMenu ? m_parentMenu->GetWindow() : NULL;
if ( (bmpUnchecked.IsOk() && IsGreaterThanStdSize(bmpUnchecked, win)) ||
(bmpChecked.IsOk() && IsGreaterThanStdSize(bmpChecked, win)) ||
(bmpChecked.IsOk() && IsCheckable()) )
{
mustUseOwnerDrawn = true;