Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-24 23:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SDK] cicuif.h: Fix CUIFMenu::SetMenuFont (#6403)

Browse source 
Supporting Language Bar...
JIRA issue: CORE-19363
Implement CUIFMenu::SetMenuFont
method.
This commit is contained in:
Katayama Hirofumi MZ 2024-01-24 15:57:45 +09:00 committed by GitHub
parent f465035cd9
commit 3056f253e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sdk/include/reactos/cicero/cicuif.h
View file

@ -4487,9 +4487,8 @@ CUIFToolbarMenuButton::CUIFToolbarMenuButton(
{
m_pToolbarButton = pParent;
HFONT hFont = ::CreateFont(8, 8, 0, 0, FW_NORMAL, FALSE, FALSE, FALSE, SYMBOL_CHARSET,
OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
DEFAULT_PITCH | FF_DONTCARE, TEXT("Marlett"));
HFONT hFont = ::CreateFontW(8, 8, 0, 0, FW_NORMAL, 0, 0, 0, SYMBOL_CHARSET,
0, 0, 0, 0, L"Marlett");
SetFont(hFont);
SetText(L"u"); // downward triangle
}
@ -5791,10 +5790,26 @@ inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam)
}
}
/// @unimplemented
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)