summaryrefslogtreecommitdiff
path: root/win
diff options
context:
space:
mode:
authorleo2003-09-19 01:13:52 +0000
committerleo2003-09-19 01:13:52 +0000
commitab1a384f3607b716505778b084b30f49abb1ab64 (patch)
treee65354f2861835aca9f1eb0c0701796baac9da12 /win
parent4bd07328df37f1bc8a16cdd77decf49467b6c4be (diff)
Fixed viewport menu width (I think).
git-svn-id: http://svn.leocad.org/trunk@350 c7d43263-9d01-0410-8a33-9dba5d9f93d6
Diffstat (limited to 'win')
-rw-r--r--win/Bmpmenu.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/win/Bmpmenu.cpp b/win/Bmpmenu.cpp
index d602f01..44f2742 100644
--- a/win/Bmpmenu.cpp
+++ b/win/Bmpmenu.cpp
@@ -180,19 +180,21 @@ void CBMPMenu::DrawItem (LPDRAWITEMSTRUCT lpDIS)
UINT u = ((CBMPMenuData*)(lpDIS->itemData))->nID;
if (u >= ID_VIEWPORT01 && u <= ID_VIEWPORT14)
{
+ int left = lpDIS->rcItem.left;
+
if (lpDIS->itemAction & ODA_DRAWENTIRE)
- m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (lpDIS->rcItem.left+3,lpDIS->rcItem.top+1), ILD_NORMAL);
+ m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (left+3,lpDIS->rcItem.top+1), ILD_NORMAL);
if ((lpDIS->itemState & ODS_SELECTED) && (lpDIS->itemAction & (ODA_SELECT | ODA_DRAWENTIRE)))
- m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (lpDIS->rcItem.left+3,lpDIS->rcItem.top+1), ILD_SELECTED);
+ m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (left+3,lpDIS->rcItem.top+1), ILD_SELECTED);
if (!(lpDIS->itemState & ODS_SELECTED) && (lpDIS->itemAction & ODA_SELECT))
- m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (lpDIS->rcItem.left+3,lpDIS->rcItem.top+1), ILD_NORMAL);
+ m_List.Draw (pDC, u - ID_VIEWPORT01, CPoint (left+3,lpDIS->rcItem.top+1), ILD_NORMAL);
if (lpDIS->itemState & ODS_CHECKED)
{
CBrush br(RGB(0,0,0));
- pDC->FrameRect(CRect (lpDIS->rcItem.left+2,lpDIS->rcItem.top,lpDIS->rcItem.right-2,lpDIS->rcItem.bottom), &br);
+ pDC->FrameRect(CRect (left+2,lpDIS->rcItem.top,left+41+4,lpDIS->rcItem.bottom), &br);
}
return;
}
@@ -463,7 +465,7 @@ void CBMPMenu::MeasureItem(LPMEASUREITEMSTRUCT lpMIS)
{
if (lpMIS->itemID >= ID_VIEWPORT01 && lpMIS->itemID <= ID_VIEWPORT14)
{
- lpMIS->itemWidth = 35;
+ lpMIS->itemWidth = 41 + 8 - GetSystemMetrics(SM_CXMENUCHECK);
lpMIS->itemHeight = 33;
return;
}