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

patch 816178 and tons of other fixes to owner drawn bitmaps appearance; some code cleanup

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24184 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-10-16 08:50:20 +00:00
parent 6f63704ff4
commit 7230716d7a
1 changed files with 76 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/msw/ownerdrw.cpp
View File

@@ -165,55 +165,36 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight)
// add space at the end of the menu for the submenu expansion arrow // add space at the end of the menu for the submenu expansion arrow
// this will also allow offsetting the accel string from the right edge // this will also allow offsetting the accel string from the right edge
*pwidth += (size_t) (GetDefaultMarginWidth() * 1.5) + 16; *pwidth += GetDefaultMarginWidth() + 16;
// JACS: items still look too tightly packed, so adding 5 pixels. // increase size to accomodate bigger bitmaps if necessary
(*pheight) = (*pheight) + 5;
// Ray Gilbert's changes - Corrects the problem of a BMP
// being placed next to text in a menu item, and the BMP does
// not match the size expected by the system. This will
// resize the space so the BMP will fit. Without this, BMPs
// must be no larger or smaller than 16x16.
if (m_bmpChecked.Ok()) if (m_bmpChecked.Ok())
{ {
// Is BMP height larger then text height? // Is BMP height larger then text height?
size_t adjustedHeight = m_bmpChecked.GetHeight() + size_t adjustedHeight = m_bmpChecked.GetHeight() +
wxSystemSettings::GetMetric(wxSYS_EDGE_Y); 2*wxSystemSettings::GetMetric(wxSYS_EDGE_Y);
if (*pheight < adjustedHeight) if (*pheight < adjustedHeight)
*pheight = adjustedHeight; *pheight = adjustedHeight;
// Does BMP encroach on default check menu position? // Does BMP encroach on default check menu position?
size_t adjustedWidth = m_bmpChecked.GetWidth() + size_t adjustedWidth = m_bmpChecked.GetWidth();
(wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2);
// Do we need to widen margin to fit BMP? // Do we need to widen margin to fit BMP?
if ((size_t)GetMarginWidth() != adjustedWidth) if ((size_t)GetMarginWidth() < adjustedWidth)
SetMarginWidth(adjustedWidth); SetMarginWidth(adjustedWidth);
} }
// add the size of the bitmap to our total size - even if we don't have
// a bitmap we leave room for one...
*pwidth += GetMarginWidth();
// make sure that this item is at least as // make sure that this item is at least as
// tall as the user's system settings specify // tall as the user's system settings specify
if (*pheight < m_nMinHeight) if (*pheight < m_nMinHeight)
*pheight = m_nMinHeight; *pheight = m_nMinHeight;
m_nHeight = *pheight; // remember height for use in OnDrawItem // remember height for use in OnDrawItem
m_nHeight = *pheight;
return TRUE; return TRUE;
} }
// searching for this macro you'll find all the code where I'm using the native
// Win32 GDI functions and not wxWindows ones. Might help to whoever decides to
// port this code to X. (VZ)
#if defined(__WIN32__) && !defined(__SYMANTEC__)
#define O_DRAW_NATIVE_API // comments below explain why I use it
#endif
// draw the item // draw the item
bool wxOwnerDrawn::OnDrawItem(wxDC& dc, bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
const wxRect& rc, const wxRect& rc,
@@ -224,10 +205,6 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
if ( act == wxODFocusChanged ) if ( act == wxODFocusChanged )
return TRUE; return TRUE;
// wxColor <-> RGB
#define ToRGB(col) PALETTERGB(col.Red(), col.Green(), col.Blue())
#define UnRGB(col) GetRValue(col), GetGValue(col), GetBValue(col)
// this flag determines whether or not an edge will // this flag determines whether or not an edge will
// be drawn around the bitmap. In most "windows classic" // be drawn around the bitmap. In most "windows classic"
@@ -256,8 +233,10 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
} }
else { else {
// fall back to default colors if none explicitly specified // fall back to default colors if none explicitly specified
colBack = m_colBack.Ok() ? ToRGB(m_colBack) : GetSysColor(COLOR_WINDOW); colBack = m_colBack.Ok() ? wxColourToPalRGB(m_colBack)
colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT); : GetSysColor(COLOR_WINDOW);
colText = m_colText.Ok() ? wxColourToPalRGB(m_colText)
: GetSysColor(COLOR_WINDOWTEXT);
} }
@@ -274,36 +253,32 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
} }
#ifdef O_DRAW_NATIVE_API HDC hdc = GetHdcOf(dc);
#define hdc (HDC)dc.GetHDC()
COLORREF colOldText = ::SetTextColor(hdc, colText), COLORREF colOldText = ::SetTextColor(hdc, colText),
colOldBack = ::SetBkColor(hdc, colBack); colOldBack = ::SetBkColor(hdc, colBack);
#else
dc.SetTextForeground(wxColor(UnRGB(colText))); int margin = GetMarginWidth() + wxSystemSettings::GetMetric(wxSYS_EDGE_X);
dc.SetTextBackground(wxColor(UnRGB(colBack)));
#endif
// select the font and draw the text // select the font and draw the text
// --------------------------------- // ---------------------------------
// determine where to draw and leave space for a check-mark. // determine where to draw and leave space for a check-mark.
// Add 3 pixel padding so text appears well within highlight rectangle int xText = rc.x + margin;
int x = rc.x + GetMarginWidth() + 3;
// using native API because it reckognizes '&' // using native API because it reckognizes '&'
#ifdef O_DRAW_NATIVE_API
int nPrevMode = SetBkMode(hdc, TRANSPARENT); int nPrevMode = SetBkMode(hdc, TRANSPARENT);
HBRUSH hbr = CreateSolidBrush(colBack), HBRUSH hbr = CreateSolidBrush(colBack),
hPrevBrush = (HBRUSH)SelectObject(hdc, hbr); hPrevBrush = (HBRUSH)SelectObject(hdc, hbr);
RECT rectFill = { rc.GetLeft(), rc.GetTop(), rc.GetRight()+1, rc.GetBottom() }; RECT rectFill = { rc.GetLeft(), rc.GetTop(),
rc.GetRight() + 1, rc.GetBottom() + 1 };
if ( st & wxODSelected && m_bmpChecked.Ok() && draw_bitmap_edge) { if ( (st & wxODSelected) && m_bmpChecked.Ok() ) {
// only draw the highlight under the text, not under // only draw the highlight under the text, not under
// the bitmap or checkmark; leave a 1-pixel gap. // the bitmap or checkmark
rectFill.left = GetMarginWidth() + 1; rectFill.left = xText;
} }
FillRect(hdc, &rectFill, hbr); FillRect(hdc, &rectFill, hbr);
@@ -326,37 +301,24 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect); GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect);
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)strMenuText.c_str(), strMenuText.length(), (LPARAM)strMenuText.c_str(), strMenuText.length(),
x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically xText, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically
rc.GetWidth()-GetMarginWidth(), sizeRect.cy, rc.GetWidth()-margin, sizeRect.cy,
DST_PREFIXTEXT | DST_PREFIXTEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
/* Right alignment does not work with DSS_DISABLED (Windows98) - why? // ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO
if ( !m_strAccel.empty() ) // as last parameter in DrawState() (at least with Windows98). So we have
{ // to take care of right alignment ourselves.
// right align accel string with right edge of menu ( offset by the margin width )
::SetTextAlign(hdc, TA_RIGHT);
::DrawState(hdc, NULL, NULL,
(LPARAM)m_strAccel.c_str(), m_strAccel.length(),
rc.GetWidth()-(GetMarginWidth()), rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
rc.GetWidth()-GetMarginWidth(), sizeRect.cy,
DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
::SetTextAlign(hdc, TA_LEFT);
}
*/
// ::SetTextAlign(hdc, TA_RIGHT) doesn't work with DSS_DISABLED or DSS_MONO as last parameter
// in DrawState() (at least with Windows98). So we have to take care of right alignment ourselves.
if ( !m_strAccel.empty() ) if ( !m_strAccel.empty() )
{ {
int accel_width, accel_height; int accel_width, accel_height;
dc.GetTextExtent(m_strAccel, &accel_width, &accel_height); dc.GetTextExtent(m_strAccel, &accel_width, &accel_height);
// right align accel string with right edge of menu ( offset by the margin width ) // right align accel string with right edge of menu ( offset by the
// margin width )
::DrawState(hdc, NULL, NULL, ::DrawState(hdc, NULL, NULL,
(LPARAM)m_strAccel.c_str(), m_strAccel.length(), (LPARAM)m_strAccel.c_str(), m_strAccel.length(),
rc.GetWidth()-GetMarginWidth()-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0), rc.GetWidth()-margin-accel_width, rc.y+(int) ((rc.GetHeight()-sizeRect.cy)/2.0),
rc.GetWidth()-GetMarginWidth()-accel_width, sizeRect.cy, rc.GetWidth()-margin-accel_width, sizeRect.cy,
DST_TEXT | DST_TEXT |
(((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0));
} }
@@ -366,42 +328,32 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
(void)SetBkMode(hdc, nPrevMode); (void)SetBkMode(hdc, nPrevMode);
DeleteObject(hbr); DeleteObject(hbr);
#else
dc.SetFont(GetFont());
dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y);
#endif //O_DRAW_NATIVE_API
// draw the bitmap // draw the bitmap
// --------------- // ---------------
if ( IsCheckable() && !m_bmpChecked.Ok() ) { if ( IsCheckable() && !m_bmpChecked.Ok() ) {
if ( st & wxODChecked ) { if ( st & wxODChecked ) {
// using native APIs for performance and simplicity
#ifdef O_DRAW_NATIVE_API
// what goes on: DrawFrameControl creates a b/w mask, // what goes on: DrawFrameControl creates a b/w mask,
// then we copy it to screen to have right colors // then we copy it to screen to have right colors
// first create a monochrome bitmap in a memory DC // first create a monochrome bitmap in a memory DC
HDC hdcMem = CreateCompatibleDC(hdc); HDC hdcMem = CreateCompatibleDC(hdc);
HBITMAP hbmpCheck = CreateBitmap(GetMarginWidth(), m_nHeight, 1, 1, 0); HBITMAP hbmpCheck = CreateBitmap(margin, m_nHeight, 1, 1, 0);
SelectObject(hdcMem, hbmpCheck); SelectObject(hdcMem, hbmpCheck);
// then draw a check mark into it // then draw a check mark into it
RECT rect = { 0, 0, GetMarginWidth(), m_nHeight }; RECT rect = { 0, 0, margin, m_nHeight };
if ( m_nHeight > 0 ) if ( m_nHeight > 0 )
{ {
::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK);
} }
// finally copy it to screen DC and clean up // finally copy it to screen DC and clean up
BitBlt(hdc, rc.x, rc.y, GetMarginWidth(), m_nHeight, BitBlt(hdc, rc.x, rc.y, margin, m_nHeight,
hdcMem, 0, 0, SRCCOPY); hdcMem, 0, 0, SRCCOPY);
DeleteDC(hdcMem); DeleteDC(hdcMem);
DeleteObject(hbmpCheck); DeleteObject(hbmpCheck);
#else
// #### to do: perhaps using Marlett font (create equiv. font under X)
// wxFAIL("not implemented");
#endif //O_DRAW_NATIVE_API
} }
} }
else { else {
@@ -431,43 +383,25 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc,
wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight()));
int heightDiff = m_nHeight - nBmpHeight; int heightDiff = m_nHeight - nBmpHeight;
dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, dc.Blit(rc.x + (margin - nBmpWidth) / 2,
rc.y + heightDiff / 2, rc.y + heightDiff / 2,
nBmpWidth, nBmpHeight, nBmpWidth, nBmpHeight,
&dcMem, 0, 0, wxCOPY, TRUE /* use mask */); &dcMem, 0, 0, wxCOPY, TRUE /* use mask */);
if ( st & wxODSelected && draw_bitmap_edge ) { if ( st & wxODSelected && draw_bitmap_edge ) {
#ifdef O_DRAW_NATIVE_API
RECT rectBmp = { rc.GetLeft(), rc.GetTop(), RECT rectBmp = { rc.GetLeft(), rc.GetTop(),
rc.GetLeft() + GetMarginWidth(), rc.GetLeft() + margin,
rc.GetTop() + m_nHeight-1 }; rc.GetTop() + m_nHeight };
SetBkColor(hdc, colBack); SetBkColor(hdc, colBack);
DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT); DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT);
#else
int x1, y1, x2, y2;
x1 = rc.x;
y1 = rc.y;
x2 = x1 + GetMarginWidth() - 1;
y2 = y1 + m_nHeight - 1;
dc.SetPen(*wxWHITE_PEN);
dc.DrawLine(x1, y1, x2, y1);
dc.DrawLine(x1, y1, x1, y2);
dc.SetPen(*wxGREY_PEN);
dc.DrawLine(x1, y2-1, x2, y2-1);
dc.DrawLine(x2, y1, x2, y2);
#endif //O_DRAW_NATIVE_API
} }
} }
} }
#ifdef O_DRAW_NATIVE_API
::SetTextColor(hdc, colOldText); ::SetTextColor(hdc, colOldText);
::SetBkColor(hdc, colOldBack); ::SetBkColor(hdc, colOldBack);
#undef hdc
#endif //O_DRAW_NATIVE_API
return TRUE; return TRUE;
} }