Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-24 17:13:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[RSHELL]

Browse source 
* CMenuToolbarBase: Use TBSTATE_BREAK on every button instead of TBSTYLE_EX_VERTICAL. This allows the vertical alignment to work on ros, although the separators are neither sized nor drawn correctly, and the arrow alignment is wrong.
NOTE: It's still not functional. Second level submenus don't show up, and clicking on items does nothing.
CORE-7881

svn path=/branches/shell-experiments/; revision=62382
This commit is contained in:
David Quintana 2014-03-02 19:35:13 +00:00
parent 28bf05e265
commit c3b293c4b2
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
base/shell/rshell/CMenuToolbars.cpp
View file

@ -113,27 +113,29 @@ HRESULT CMenuToolbarBase::OnWinEvent(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
rc = cdraw->nmcd.rc; rc = cdraw->nmcd.rc;
hdc = cdraw->nmcd.hdc; hdc = cdraw->nmcd.hdc;
isHot = m_hotBar == this && m_hotItem == (INT) cdraw->nmcd.dwItemSpec; isHot = m_hotBar == this && m_hotItem == static_cast<INT>(cdraw->nmcd.dwItemSpec);
isPopup = m_popupBar == this && m_popupItem == (INT) cdraw->nmcd.dwItemSpec; isPopup = m_popupBar == this && m_popupItem == static_cast<INT>(cdraw->nmcd.dwItemSpec);
if (isHot || (m_hotItem < 0 && isPopup)) if (isHot || (m_hotItem < 0 && isPopup))
{ {
cdraw->nmcd.uItemState = CDIS_HOT; cdraw->nmcd.uItemState |= CDIS_HOT;
}
else
{
cdraw->nmcd.uItemState &= ~CDIS_HOT;
} }
switch (cdraw->nmcd.uItemState) if (cdraw->nmcd.uItemState&CDIS_HOT)
{ {
case CDIS_HOT:
case CDIS_FOCUS:
FillRect(hdc, &rc, hotBrush); FillRect(hdc, &rc, hotBrush);
SetTextColor(hdc, clrTextHighlight); SetTextColor(hdc, clrTextHighlight);
cdraw->clrText = clrTextHighlight; cdraw->clrText = clrTextHighlight;
break; }
default: else
{
FillRect(hdc, &rc, bgBrush); FillRect(hdc, &rc, bgBrush);
SetTextColor(hdc, clrText); SetTextColor(hdc, clrText);
cdraw->clrText = clrText; cdraw->clrText = clrText;
break;
} }
cdraw->iListGap += 4; cdraw->iListGap += 4;
@ -257,7 +259,9 @@ HRESULT CMenuToolbarBase::CreateToolbar(HWND hwndParent, DWORD dwFlags)
if (dwFlags & SMINIT_VERTICAL) if (dwFlags & SMINIT_VERTICAL)
{ {
tbStyles |= CCS_VERT; tbStyles |= CCS_VERT;
tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW;
// FIXME: Use when it works in ros (?)
//tbExStyles |= TBSTYLE_EX_VERTICAL | WS_EX_TOOLWINDOW;
} }
RECT rc; RECT rc;
@ -700,7 +704,7 @@ HRESULT CMenuStaticToolbar::FillToolbar()
TBBUTTON tbb = { 0 }; TBBUTTON tbb = { 0 };
PWSTR MenuString = NULL; PWSTR MenuString = NULL;
tbb.fsState = TBSTATE_ENABLED; tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP;
tbb.fsStyle = 0; tbb.fsStyle = 0;
info.cbSize = sizeof(info); info.cbSize = sizeof(info);
@ -833,7 +837,7 @@ HRESULT CMenuSFToolbar::FillToolbar()
INT indexOpen = 0; INT indexOpen = 0;
TBBUTTON tbb = { 0 }; TBBUTTON tbb = { 0 };
tbb.fsState = TBSTATE_ENABLED; tbb.fsState = TBSTATE_ENABLED | TBSTATE_WRAP;
tbb.fsStyle = 0; tbb.fsStyle = 0;
STRRET sr = { STRRET_CSTR, { 0 } }; STRRET sr = { STRRET_CSTR, { 0 } };