Ros-diffs

ros-diffs@reactos.org

11 participants
81011 discussions

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintO10 (#6410)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a88c85259bd17df0fb0d0… commit a88c85259bd17df0fb0d0a417694a612313613c7 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:09:56 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:09:56 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintO10 (#6410) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::OnPaintO10 method. --- sdk/include/reactos/cicero/cicuif.h | 71 +++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 2a6601701c8..c1e2f337027 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -6210,11 +6210,78 @@ CUIFMenuItem::OnPaint(HDC hDC) OnPaintDef(hDC); } -/// unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::OnPaintO10(HDC hDC) { - //FIXME + if (!m_pScheme) + return; + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + SIZE textSize; + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &textSize); + + LONG cySpace = m_rc.bottom - m_rc.top - textSize.cy; + LONG xCheck = m_rc.left, yCheck = m_rc.top + cySpace / 2; + LONG cxyMargin = (m_pMenu->m_bHasMargin ? m_pMenu->m_cxyMargin : 0); + + LONG xBitmap = m_rc.left + cxyMargin, yBitmap = m_rc.top; + LONG xText = m_rc.left + m_pMenu->m_cxyMargin + cxyMargin + 8; + LONG yText = m_rc.top + cySpace / 2; + LONG xArrow = m_rc.left - textSize.cy + m_rc.right - 2; + LONG xRightText = m_rc.right - m_pMenu->m_cxMenuExtent - 8; + + RECT rc; + GetRect(&rc); + + if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + rc.right = m_pMenu->m_cxyMargin + rc.left + 2; + if (m_pMenu->m_bHasMargin) + rc.right += m_pMenu->m_cxyMargin; + + ::FillRect(hDC, &rc, m_pScheme->GetBrush(9)); + } + else + { + m_pScheme->DrawCtrlBkgd(hDC, &rc, 0, UIF_DRAW_PRESSED); + m_pScheme->DrawCtrlEdge(hDC, &rc, 0, UIF_DRAW_PRESSED); + } + + ::SetBkMode(hDC, TRANSPARENT); + + if (m_bMenuItemGrayed) + { + ::SetTextColor(hDC, m_pScheme->GetColor(11)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + else if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, m_pScheme->GetColor(10)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + else + { + ::SetTextColor(hDC, m_pScheme->GetColor(5)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + } + + DrawUnderline(hDC, xText, yText, m_pScheme->GetBrush(5)); + + if (m_pszMenuItemRight) + { + ::ExtTextOutW(hDC, xRightText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemRight, + m_cchMenuItemRight, NULL); + } + + DrawCheck(hDC, xCheck, yCheck); + DrawBitmapProc(hDC, xBitmap, yBitmap); + DrawArrow(hDC, xArrow, yText); + + ::SelectObject(hDC, hFontOld); } inline STDMETHODIMP_(void)

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintDef (#6409)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6634f66e0e4b173454974… commit 6634f66e0e4b173454974a2b46455150e8447fe1 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Jan 25 12:09:02 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Jan 25 12:09:02 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::OnPaintDef (#6409) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::OnPaintDef method. --- sdk/include/reactos/cicero/cicuif.h | 62 +++++++++++++++++++++++++++++++++++-- 1 file changed, 60 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index d3f440a3fa7..2a6601701c8 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -6217,11 +6217,69 @@ CUIFMenuItem::OnPaintO10(HDC hDC) //FIXME } -/// unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::OnPaintDef(HDC hDC) { - //FIXME + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + + SIZE textSize; + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &textSize); + + LONG cxyMargin = (m_pMenu->m_bHasMargin ? m_pMenu->m_cxyMargin : 0); + + LONG cySpace = m_rc.bottom - m_rc.top - textSize.cy; + LONG xCheck = m_rc.left, yCheck = m_rc.top + cySpace / 2; + LONG xBitmap = m_rc.left + cxyMargin, yBitmap = m_rc.top; + LONG xText = m_rc.left + cxyMargin + m_pMenu->m_cxyMargin + 2; + LONG yText = m_rc.top + cySpace / 2; + + LONG xArrow = m_rc.right + m_rc.left - 10; + + ::SetBkMode(hDC, TRANSPARENT); + + if (m_bMenuItemGrayed) + { + UINT uOptions = ETO_CLIPPED; + if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNHIGHLIGHT)); + ::ExtTextOutW(hDC, xText + 1, yText + 1, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawCheck(hDC, xCheck + 1, yCheck + 1); + DrawBitmapProc(hDC, xBitmap + 1, yBitmap + 1); + DrawArrow(hDC, xArrow + 1, yText + 1); + } + else + { + ::SetBkColor(hDC, ::GetSysColor(COLOR_HIGHLIGHT)); + uOptions = ETO_CLIPPED | ETO_OPAQUE; + } + ::SetTextColor(hDC, ::GetSysColor(COLOR_BTNSHADOW)); + ::ExtTextOutW(hDC, xText, yText, uOptions, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_BTNSHADOW + 1)); + } + else if (m_bMenuItemDisabled || m_pMenu->m_pSelectedItem != this) + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_MENUTEXT)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED, &m_rc, m_pszMenuItemLeft, + m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_MENUTEXT + 1)); + } + else + { + ::SetTextColor(hDC, ::GetSysColor(COLOR_HIGHLIGHTTEXT)); + ::SetBkColor(hDC, ::GetSysColor(COLOR_HIGHLIGHT)); + ::ExtTextOutW(hDC, xText, yText, ETO_CLIPPED | ETO_OPAQUE, &m_rc, + m_pszMenuItemLeft, m_cchMenuItemLeft, NULL); + DrawUnderline(hDC, xText, yText, (HBRUSH)UlongToHandle(COLOR_HIGHLIGHTTEXT + 1)); + } + + DrawCheck(hDC, xCheck, yCheck); + DrawBitmapProc(hDC, xBitmap, yBitmap); + DrawArrow(hDC, xArrow, yText); + + ::SelectObject(hDC, hFontOld); } inline STDMETHODIMP_(void)

11 months, 3 weeks

[reactos] 01/01: [NTOS:KE/x86/arm] Use a better boot process affinity value (#6399)

by Oleg Dubinskiy

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5abf0c76b7251b1b03d8e… commit 5abf0c76b7251b1b03d8e326bd95951566e1bae7 Author: Oleg Dubinskiy <oleg.dubinskij30(a)gmail.com> AuthorDate: Wed Jan 24 17:52:56 2024 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:52:56 2024 +0100 [NTOS:KE/x86/arm] Use a better boot process affinity value (#6399) Use a value that is independent of the CPU bitness. Addendum to commit 96d5b6281 --- ntoskrnl/ke/arm/kiinit.c | 2 +- ntoskrnl/ke/i386/kiinit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ntoskrnl/ke/arm/kiinit.c b/ntoskrnl/ke/arm/kiinit.c index 86db2d9377f..34413f17a57 100644 --- a/ntoskrnl/ke/arm/kiinit.c +++ b/ntoskrnl/ke/arm/kiinit.c @@ -101,7 +101,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR; diff --git a/ntoskrnl/ke/i386/kiinit.c b/ntoskrnl/ke/i386/kiinit.c index 2620885156a..e3ec9ed94bf 100644 --- a/ntoskrnl/ke/i386/kiinit.c +++ b/ntoskrnl/ke/i386/kiinit.c @@ -527,7 +527,7 @@ KiInitializeKernel(IN PKPROCESS InitProcess, PageDirectory[1] = 0; KeInitializeProcess(InitProcess, 0, - 0xFFFFFFFF, + MAXULONG_PTR, PageDirectory, FALSE); InitProcess->QuantumReset = MAXCHAR;

11 months, 3 weeks

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=927b183aa97fb040717ae… commit 927b183aa97fb040717ae4c9b76cd3e7364549bd Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 19:13:24 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 19:13:24 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::DrawUnderline (#6406) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::DrawUnderline method. --- sdk/include/reactos/cicero/cicuif.h | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 77e84fff690..d3f440a3fa7 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -762,9 +762,9 @@ class CUIFMenuItem : public CUIFObject protected: UINT m_nMenuItemID; LPWSTR m_pszMenuItemLeft; - INT m_cchMenuItemLeft; + UINT m_cchMenuItemLeft; LPWSTR m_pszMenuItemRight; - INT m_cchMenuItemRight; + UINT m_cchMenuItemRight; UINT m_nMenuItemVKey; UINT m_ichMenuItemPrefix; HBITMAP m_hbmColor; @@ -782,7 +782,7 @@ protected: void DrawArrow(HDC hDC, INT x, INT y); void DrawBitmapProc(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: CUIFMenuItem(CUIFMenu *pMenu, BOOL bDisabled); @@ -6153,11 +6153,24 @@ inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop) ::SelectObject(hDC, hFontOld); } -/// @unimplemented 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)

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenu::OnKeyDown (#6408)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3ac5de4102cef3c7acb35… commit 3ac5de4102cef3c7acb3579049115aae43ddd7a2 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 17:52:36 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:52:36 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::OnKeyDown (#6408) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::OnKeyDown method. --- sdk/include/reactos/cicero/cicuif.h | 78 ++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index f6fcf6a9f0c..77e84fff690 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5771,11 +5771,85 @@ CUIFMenu::ModalMouseNotify(UINT uMsg, LONG x, LONG y) CancelMenu(); } -/// @unimplemented inline STDMETHODIMP_(void) CUIFMenu::OnKeyDown(HWND hWnd, WPARAM wParam, LPARAM lParam) { - //FIXME + CUIFMenuItem *pTargetItem; + + BYTE vKey = (BYTE)wParam; + + switch (vKey) + { + case VK_ESCAPE: + CancelMenu(); + return; + + case VK_LEFT: + if (!m_pVisibleSubMenu) + return; + + CancelMenu(); + return; + + case VK_RIGHT: + if (m_pSelectedItem && m_pSelectedItem->m_pSubMenu) + { + m_pSelectedItem->ShowSubPopup(); + CUIFMenu *pSubMenu = m_pSelectedItem->m_pSubMenu; + pTargetItem = pSubMenu->GetNextItem(NULL); + pSubMenu->SetSelectedItem(pTargetItem); + } + return; + + case VK_UP: + pTargetItem = GetPrevItem(m_pSelectedItem); + SetSelectedItem(pTargetItem); + return; + + case VK_DOWN: + pTargetItem = GetNextItem(m_pSelectedItem); + SetSelectedItem(pTargetItem); + return; + + case VK_RETURN: + break; + + default: + { + if (!(('A' <= vKey && vKey <= 'Z') || ('0' <= vKey && vKey <= '9'))) + return; + + size_t iItem; + for (iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (pItem->m_nMenuItemVKey == vKey) + { + SetSelectedItem(pItem); + break; + } + } + + if (iItem == m_MenuItems.size()) + return; + } + } + + if (m_pSelectedItem && !m_pSelectedItem->m_bMenuItemGrayed) + { + CUIFMenu *pSubMenu = m_pSelectedItem->m_pSubMenu; + if (pSubMenu) + { + m_pSelectedItem->ShowSubPopup(); + pTargetItem = pSubMenu->GetNextItem(NULL); + pSubMenu->SetSelectedItem(pTargetItem); + } + else + { + SetSelectedId(m_pSelectedItem->m_nMenuItemID); + ::PostMessage(m_hWnd, WM_NULL, 0, 0); + } + } } inline void CUIFMenu::PostKey(BOOL bUp, WPARAM wParam, LPARAM lParam)

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::InitMenuExtent (#6407)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76c898ca8e6072931c5ae… commit 76c898ca8e6072931c5aeb824279d51d3604051a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 17:51:59 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 17:51:59 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::InitMenuExtent (#6407) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::InitMenuExtent method. --- sdk/include/reactos/cicero/cicuif.h | 37 +++++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 7ae16842900..f6fcf6a9f0c 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5979,11 +5979,44 @@ inline BOOL CUIFMenuItem::Init(UINT nMenuItemID, LPCWSTR pszText) return TRUE; } -/// @unimplemented inline STDMETHODIMP_(void) CUIFMenuItem::InitMenuExtent() { - //FIXME + if (!m_pszMenuItemLeft) + { + if (m_hbmColor) + { + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + m_MenuLeftExtent.cx = bm.bmWidth + 2; + m_MenuLeftExtent.cy = bm.bmHeight + 4; + } + else + { + m_MenuLeftExtent.cx = m_MenuLeftExtent.cy = 0; + } + return; + } + + HDC hDC = ::GetDC(*m_pWindow); + + HGDIOBJ hFontOld = ::SelectObject(hDC, m_hFont); + ::GetTextExtentPoint32W(hDC, m_pszMenuItemLeft, m_cchMenuItemLeft, &m_MenuLeftExtent); + m_MenuLeftExtent.cx += 16; + m_MenuLeftExtent.cy += 8; + if (m_pszMenuItemRight) + { + ::GetTextExtentPoint32W(hDC, m_pszMenuItemRight, m_cchMenuItemRight, &m_MenuRightExtent); + m_MenuRightExtent.cy += 8; + } + ::SelectObject(hDC, hFontOld); + + if (m_pSubMenu) + m_MenuLeftExtent.cx += m_MenuLeftExtent.cy + 2; + if (m_pMenu->m_style & UIF_MENU_USE_OFF10) + m_MenuLeftExtent.cx += 24; + + ::ReleaseDC(*m_pWindow, hDC); } inline BOOL CUIFMenuItem::IsCheck()

11 months, 3 weeks

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

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3056f253e430e13f4ad1a… commit 3056f253e430e13f4ad1a8c80b3ffe2705247424 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 15:57:45 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 15:57:45 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::SetMenuFont (#6403) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::SetMenuFont method. --- sdk/include/reactos/cicero/cicuif.h | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index e48cdbad0ab..7ae16842900 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -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)

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::Init (#6405)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f465035cd91c5d543fd01… commit f465035cd91c5d543fd013ff6bc2adfb80b2229d Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:42:17 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:42:17 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::Init (#6405) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::Init method. --- sdk/include/reactos/cicero/cicuif.h | 50 +++++++++++++++++++++++++++++++++++-- 1 file changed, 48 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 46a63d8462d..e48cdbad0ab 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5911,10 +5911,56 @@ inline CUIFMenuItem::~CUIFMenuItem() } } -/// @unimplemented inline BOOL CUIFMenuItem::Init(UINT nMenuItemID, LPCWSTR pszText) { - //FIXME + m_nMenuItemID = nMenuItemID; + + if (!pszText) + { + m_pszMenuItemLeft = NULL; + m_cchMenuItemLeft = 0; + return TRUE; + } + + INT cch = lstrlenW(pszText); + m_pszMenuItemLeft = new(cicNoThrow) WCHAR[cch + 1]; + if (!m_pszMenuItemLeft) + return FALSE; + + const WCHAR *pch0 = pszText; + INT ich1, ich2; + for (ich1 = 0; *pch0 && *pch0 != L'\t'; ++ich1, ++pch0) + { + if (*pch0 == L'&' && *++pch0 != L'&') + { + m_nMenuItemVKey = ::VkKeyScanW(*pch0); + if (!m_nMenuItemVKey) + m_nMenuItemVKey = (BYTE)VkKeyScanA(*(BYTE*)pch0); + m_ichMenuItemPrefix = ich1; + } + m_pszMenuItemLeft[ich1] = *pch0; + } + m_pszMenuItemLeft[ich1] = 0; + m_cchMenuItemLeft = lstrlenW(m_pszMenuItemLeft); + + if (*pch0 == L'\t') + { + m_cchMenuItemRight = 0; + m_pszMenuItemRight = new(cicNoThrow) WCHAR[cch + 1]; + if (m_pszMenuItemRight) + { + ++pch0; + WCHAR wch = *pch0; + for (ich2 = 0; *pch0; ++ich2) + { + m_pszMenuItemRight[ich2] = wch; + wch = *++pch0; + } + m_pszMenuItemRight[ich2] = 0; + m_cchMenuItemRight = lstrlenW(m_pszMenuItemRight); + } + } + return TRUE; }

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenuItem::DrawBitmapProc (#6404)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=21e759735ea386077540b… commit 21e759735ea386077540bffd44b193b4b3745d81 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:41:46 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:41:46 2024 +0900 [SDK] cicuif.h: Fix CUIFMenuItem::DrawBitmapProc (#6404) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenuItem::DrawBitmapProc method. --- sdk/include/reactos/cicero/cicuif.h | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index ba366c6f674..46a63d8462d 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5940,10 +5940,38 @@ inline void CUIFMenuItem::DrawArrow(HDC hDC, INT xLeft, INT yTop) ::SelectObject(hDC, hFontOld); } -/// @unimplemented inline void CUIFMenuItem::DrawBitmapProc(HDC hDC, INT xLeft, INT yTop) { - //FIXME + if (!m_pScheme || !m_hbmColor) + return; + + BITMAP bm; + ::GetObject(m_hbmColor, sizeof(bm), &bm); + + INT width = m_pMenu->m_cxyMargin, height = m_rc.bottom - m_rc.top; + if (width > bm.bmWidth) + { + width = bm.bmWidth; + xLeft += (width - bm.bmWidth) / 2; + } + if (height > bm.bmHeight) + { + height = bm.bmHeight; + yTop += (height - bm.bmHeight) / 2; + } + + RECT rc = { xLeft, yTop, xLeft + width, yTop + height }; + + if (IsRTL()) + m_pScheme->m_bMirroring = TRUE; + + if (m_pMenu->m_pSelectedItem != this || m_bMenuItemDisabled) + m_pScheme->DrawFrameCtrlBitmap(hDC, &rc, m_hbmColor, m_hbmMask, 0); + else + m_pScheme->DrawFrameCtrlBitmap(hDC, &rc, m_hbmColor, m_hbmMask, UIF_DRAW_PRESSED); + + if (IsRTL()) + m_pScheme->m_bMirroring = FALSE; } inline void CUIFMenuItem::DrawCheck(HDC hDC, INT xLeft, INT yTop)

11 months, 3 weeks

[reactos] 01/01: [SDK] cicuif.h: Fix CUIFMenu::InitShow (#6402)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f170276fd263b4c697400… commit f170276fd263b4c69740042beda9fa534abd45f4 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Jan 24 14:41:04 2024 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Jan 24 14:41:04 2024 +0900 [SDK] cicuif.h: Fix CUIFMenu::InitShow (#6402) Supporting Language Bar... JIRA issue: CORE-19363 Implement CUIFMenu::InitShow method. --- sdk/include/reactos/cicero/cicuif.h | 149 +++++++++++++++++++++++++++++++++++- 1 file changed, 147 insertions(+), 2 deletions(-) diff --git a/sdk/include/reactos/cicero/cicuif.h b/sdk/include/reactos/cicero/cicuif.h index 257df7162d8..ba366c6f674 100644 --- a/sdk/include/reactos/cicero/cicuif.h +++ b/sdk/include/reactos/cicero/cicuif.h @@ -5579,11 +5579,156 @@ inline void CUIFMenu::HandleMouseMsg(UINT uMsg, LONG x, LONG y) CUIFWindow::HandleMouseMsg(uMsg, x, y); } -/// @unimplemented inline STDMETHODIMP_(BOOL) CUIFMenu::InitShow(CUIFWindow *pWindow, LPCRECT prc, BOOL bFlag, BOOL bDoAnimation) { - //FIXME + HWND hWnd = NULL; + if (pWindow) + hWnd = *pWindow; + + CreateWnd(hWnd); + + m_bHasMargin = FALSE; + + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + if (m_MenuItems[iItem]) + m_MenuItems[iItem]->InitMenuExtent(); + } + + INT cxMax = 0; + + m_cxMenuExtent = 0; + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (!pItem) + continue; + + INT cxItem = m_cxyMargin + pItem->m_MenuLeftExtent.cx; + if (cxMax < cxItem) + cxMax = cxItem; + m_cxMenuExtent = max(m_cxMenuExtent, pItem->m_MenuRightExtent.cx); + if (!m_bHasMargin && pItem->m_hbmColor && pItem->IsCheck()) + m_bHasMargin = TRUE; + } + + RECT rcItem = { 0, 0, 0, 0 }; + for (size_t iItem = 0; iItem < m_MenuItems.size(); ++iItem) + { + CUIFMenuItem *pItem = m_MenuItems[iItem]; + if (!pItem) + continue; + + INT cyItem = pItem->m_MenuLeftExtent.cy; + rcItem.right = rcItem.left + cxMax + m_cxMenuExtent; + rcItem.bottom = rcItem.top + cyItem; + pItem->SetRect(&rcItem); + rcItem.top += cyItem; + AddUIObj(pItem); + } + + rcItem.top = 0; + DWORD style = ::GetWindowLongPtr(hWnd, GWL_STYLE); + cxMax = rcItem.right; + INT cyMax = rcItem.bottom; + if (style & WS_DLGFRAME) + { + cxMax = rcItem.right + 2 * ::GetSystemMetrics(SM_CXDLGFRAME); + cyMax += 2 * ::GetSystemMetrics(SM_CYDLGFRAME); + } + else if (style & WS_BORDER) + { + cxMax = rcItem.right + 2 * ::GetSystemMetrics(SM_CXBORDER); + cyMax += 2 * ::GetSystemMetrics(SM_CYBORDER); + } + + RECT rc = { 0, 0, ::GetSystemMetrics(SM_CXSCREEN), ::GetSystemMetrics(SM_CYSCREEN) }; + + RECT rc3 = *prc; + HMONITOR hMon = ::MonitorFromRect(&rc3, MONITOR_DEFAULTTONEAREST); + if (hMon) + { + MONITORINFO mi = { sizeof(mi) }; + if (::GetMonitorInfo(hMon, &mi)) + rc = mi.rcMonitor; + } + + if (m_style & 0x200) + rcItem.left -= cxMax; + + INT x, y; + DWORD dwFlags2 = 0; + + if (bFlag) + { + INT bottom = prc->bottom; + x = rcItem.left + prc->left; + if (rcItem.top + bottom + cyMax > rc.bottom) + { + bottom = prc->top - cyMax; + dwFlags2 = 8; + } + else + { + dwFlags2 = 4; + } + + y = rcItem.top + bottom; + + if (rcItem.left + cxMax + prc->right > rc.right) + x = rc.right - cxMax; + } + else + { + y = rcItem.top + prc->top; + if (rcItem.left + prc->right + cxMax > rc.right) + { + x = rcItem.left + prc->left - cxMax; + dwFlags2 = 2; + } + else + { + x = rcItem.left + prc->right; + dwFlags2 = 1; + } + if (rcItem.top + cyMax + prc->bottom > rc.bottom) + y = rc.bottom - cyMax; + } + + if (x > rc.right - cxMax) + x = rc.right - cxMax; + if (x < rc.left) + x = rc.left; + if (y > rc.bottom - cyMax) + y = rc.bottom - cyMax; + if (y < rc.top) + y = rc.top; + + Move(x, y, cxMax, -1); + + SetRect(NULL); + + BOOL bAnimation = FALSE; + if (bDoAnimation && + ::SystemParametersInfo(SPI_GETMENUANIMATION, 0, &bAnimation, 0) && bAnimation) + { + BOOL bMenuFade = FALSE; + if (!::SystemParametersInfoA(SPI_GETMENUFADE, 0, &bMenuFade, 0)) + bMenuFade = FALSE; + + DWORD dwFlags = (bMenuFade ? 0x80000 : dwFlags2) | 0x40000; + if (!AnimateWnd(200, dwFlags)) + Show(TRUE); + } + else + { + Show(TRUE); + } + + if (m_pVisibleSubMenu) + m_pVisibleSubMenu->m_pParentMenu = this; + return TRUE; }

11 months, 3 weeks

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs