Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SDK] cicuif.h: Fix CUIFMenuItem::DrawUnderline (#6406)

Browse source 
Supporting Language Bar...
JIRA issue: CORE-19363
Implement CUIFMenuItem::DrawUnderline
method.
This commit is contained in:
Katayama Hirofumi MZ 2024-01-24 19:13:24 +09:00 committed by GitHub
parent 3ac5de4102
commit 927b183aa9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -762,9 +762,9 @@ class CUIFMenuItem : public CUIFObject
protected: protected:
UINT m_nMenuItemID; UINT m_nMenuItemID;
LPWSTR m_pszMenuItemLeft; LPWSTR m_pszMenuItemLeft;
INT m_cchMenuItemLeft; UINT m_cchMenuItemLeft;
LPWSTR m_pszMenuItemRight; LPWSTR m_pszMenuItemRight;
INT m_cchMenuItemRight; UINT m_cchMenuItemRight;
UINT m_nMenuItemVKey; UINT m_nMenuItemVKey;
UINT m_ichMenuItemPrefix; UINT m_ichMenuItemPrefix;
HBITMAP m_hbmColor; HBITMAP m_hbmColor;
@ -782,7 +782,7 @@ protected:
void DrawArrow(HDC hDC, INT x, INT y); void DrawArrow(HDC hDC, INT x, INT y);
void DrawBitmapProc(HDC hDC, INT xLeft, INT yTop); void DrawBitmapProc(HDC hDC, INT xLeft, INT yTop);
void DrawCheck(HDC hDC, INT xLeft, INT yTop); void DrawCheck(HDC hDC, INT xLeft, INT yTop);
void DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr); void DrawUnderline(HDC hDC, INT xText, INT yText, HBRUSH hbr);
public: public:
CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled); CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled);
@ -6153,11 +6153,24 @@ inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop)
::SelectObject(hDC, hFontOld); ::SelectObject(hDC, hFontOld);
} }
/// @unimplemented
inline void inline void
CUIFMenuItem::DrawUnderline(HDC hDC, INT cxMargin, INT cyMargin, HBRUSH hbr) CUIFMenuItem::DrawUnderline(HDC hDC, INT xText, INT yText, HBRUSH hbr)
{ {
//FIXME if (m_ichMenuItemPrefix > m_cchMenuItemLeft)
return;
SIZE PrePrefixSize, PostPrefixSize;
::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_ichMenuItemPrefix, &PrePrefixSize);
::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_ichMenuItemPrefix + 1, &PostPrefixSize);
BOOL bHeadPrefix = (m_ichMenuItemPrefix == 0);
RECT rc;
rc.left = xText + PrePrefixSize.cx + !bHeadPrefix;
rc.right = xText + PostPrefixSize.cx;
rc.top = (yText + PostPrefixSize.cy) - 1;
rc.bottom = yText + PostPrefixSize.cy;
::FillRect(hDC, &rc, hbr);
} }
inline STDMETHODIMP_(void) inline STDMETHODIMP_(void)