mirror of
https://github.com/reactos/reactos.git
synced 2024-06-28 08:51:29 +00:00
[SDK] cicuif.h: Fix CUIFMenu::SetMenuFont (#6403)
Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::SetMenuFont method.
This commit is contained in:
parent
f465035cd9
commit
3056f253e4
|
@ -4487,9 +4487,8 @@ CUIFToolbarMenuButton::CUIFToolbarMenuButton(
|
||||||
{
|
{
|
||||||
m_pToolbarButton = pParent;
|
m_pToolbarButton = pParent;
|
||||||
|
|
||||||
HFONT hFont = ::CreateFont(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SYMBOL_CHARSET,
|
HFONT hFont = ::CreateFontW(8, 8, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET,
|
||||||
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
|
0, 0, 0, 0, L"Marlett");
|
||||||
DEFAULT_PITCH | FF_DONTCARE, TEXT("Marlett"));
|
|
||||||
SetFont(hFont);
|
SetFont(hFont);
|
||||||
SetText(L"u"); // downward triangle
|
SetText(L"u"); // downward triangle
|
||||||
}
|
}
|
||||||
|
@ -5791,10 +5790,26 @@ inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// @unimplemented
|
|
||||||
inline void CUIFMenu::SetMenuFont()
|
inline void CUIFMenu::SetMenuFont()
|
||||||
{
|
{
|
||||||
//FIXME
|
LONG height = 14;
|
||||||
|
|
||||||
|
NONCLIENTMETRICS ncm = { sizeof(ncm) };
|
||||||
|
if (::SystemParametersInfo(SPI_GETNONCLIENTMETRICS, 0, &ncm, 0))
|
||||||
|
{
|
||||||
|
HFONT hFont = ::CreateFontIndirect(&ncm.lfMenuFont);
|
||||||
|
SetFont(hFont);
|
||||||
|
|
||||||
|
LONG lfHeight = ncm.lfMenuFont.lfHeight;
|
||||||
|
if (lfHeight < 0)
|
||||||
|
lfHeight = -lfHeight;
|
||||||
|
height = (ncm.iMenuHeight + lfHeight) / 2;
|
||||||
|
}
|
||||||
|
|
||||||
|
m_hMenuFont = ::CreateFontW(height, 0, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET,
|
||||||
|
0, 0, 0, 0, L"Marlett");
|
||||||
|
INT cxSmallIcon = ::GetSystemMetrics(SM_CXSMICON);
|
||||||
|
m_cxyMargin = max(height, cxSmallIcon) + 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void CUIFMenu::SetSelectedId(UINT nSelectID)
|
inline void CUIFMenu::SetSelectedId(UINT nSelectID)
|
||||||
|
|
Loading…
Reference in a new issue