Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Applied patch [ 592363 ] Owner Draw Round 2 fixes

Browse Source 
This patch fixes the following items in the owner draw
code:

* When an item is disabled, yet highlighted, the code
will now retrieve the user's system settings for
greyed-out text and use that color. Previously, the
code had continued to print the disabled text with an
embossed effect, which looked bad when the item was
highlighted.

* Menu formatting, such as hot-key underlining
(example, "&Open"), has been fixed.

* Measurements and alignments with
accelerators/hot-keys has been fixed.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16401 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-08-08 09:10:04 +00:00
parent 2ad99bc139
commit 5ac7be7a9f
1 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/msw/ownerdrw.cpp
View File

@@ -112,6 +112,18 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); dc.GetTextExtent(str, (long *)pwidth, (long *)pheight);
if (!m_strAccel.IsEmpty())
{
// measure the accelerator string, and add it's width to
// the total item width, plus 16 (Accelerators are right justified,
// with the right edge of the text rectangle 16 pixels left of
// the right edge of the menu)
int accel_width, accel_height;
dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
*pwidth += (accel_width + 16);
}
// JACS: items still look too tightly packed, so adding 5 pixels. // JACS: items still look too tightly packed, so adding 5 pixels.
(*pheight) = (*pheight) + 5; (*pheight) = (*pheight) + 5;
@@ -180,7 +192,14 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
DWORD colBack, colText; DWORD colBack, colText;
if ( st & wxODSelected ) { if ( st & wxODSelected ) {
colBack = GetSysColor(COLOR_HIGHLIGHT); colBack = GetSysColor(COLOR_HIGHLIGHT);
if (!(st & wxODDisabled))
{
colText = GetSysColor(COLOR_HIGHLIGHTTEXT); colText = GetSysColor(COLOR_HIGHLIGHTTEXT);
}
else
{
colText = GetSysColor(COLOR_GRAYTEXT);
}
} }
else { else {
// fall back to default colors if none explicitly specified // fall back to default colors if none explicitly specified
@@ -236,23 +255,24 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont); HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont);
wxString strStrippedName = wxStripMenuCodes(m_strName); wxString strMenuText = m_strName.BeforeFirst('\t');
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)strStrippedName.c_str(), strStrippedName.length(), (LPARAM)strMenuText.c_str(), strMenuText.length(),
x, rc.y + 1, rc.GetWidth(), rc.GetHeight(), x, rc.y + 1, rc.GetWidth(), rc.GetHeight(),
DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0)); DST_PREFIXTEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
if ( !m_strAccel.empty() ) if ( !m_strAccel.empty() )
{ {
RECT r; int accel_width, accel_height;
r.top = rc.GetTop() + 1; dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
r.left = rc.GetLeft();
r.right = rc.GetRight() - 16;
r.bottom = rc.GetBottom();
DrawText(hdc, m_strAccel, m_strAccel.length(), &r, ::DrawState(hdc, NULL, NULL,
DT_SINGLELINE | DT_RIGHT); (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
rc.GetRight() - accel_width - 16, rc.y + 1, 0, 0,
DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
} }
(void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevBrush);