X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dbc38199c0d74ba6cddeced769765a2e445e380d..1be9536aaaa160cc4d8e8acfc26d5c39ca2f57be:/src/msw/ownerdrw.cpp?ds=sidebyside diff --git a/src/msw/ownerdrw.cpp b/src/msw/ownerdrw.cpp index 37ea1f8b81..602bfd02ff 100644 --- a/src/msw/ownerdrw.cpp +++ b/src/msw/ownerdrw.cpp @@ -6,7 +6,7 @@ // Created: 13.11.97 // RCS-ID: $Id$ // Copyright: (c) 1998 Vadim Zeitlin -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -23,7 +23,7 @@ #ifndef WX_PRECOMP #include "wx/window.h" -// #include "wx/msw/private.h" + #include "wx/msw/private.h" #include "wx/font.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" @@ -34,9 +34,58 @@ #include "wx/settings.h" #include "wx/ownerdrw.h" #include "wx/menuitem.h" +#include "wx/fontutil.h" +#include "wx/module.h" #if wxUSE_OWNER_DRAWN +class wxMSWSystemMenuFontModule : public wxModule +{ +public: + + virtual bool OnInit() + { + ms_systemMenuFont = new wxFont; + +#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) + NONCLIENTMETRICS nm; + nm.cbSize = sizeof(NONCLIENTMETRICS); + SystemParametersInfo(SPI_GETNONCLIENTMETRICS,0,&nm,0); + + ms_systemMenuButtonWidth = nm.iMenuHeight; + ms_systemMenuHeight = nm.iMenuHeight; + + // create menu font + wxNativeFontInfo info; + memcpy(&info.lf, &nm.lfMenuFont, sizeof(LOGFONT)); + ms_systemMenuFont->Create(info); +#endif + + return true; + } + + virtual void OnExit() + { + delete ms_systemMenuFont; + ms_systemMenuFont = NULL; + } + + static wxFont* ms_systemMenuFont; + static int ms_systemMenuButtonWidth; // windows clean install default + static int ms_systemMenuHeight; // windows clean install default +private: + DECLARE_DYNAMIC_CLASS(wxMSWSystemMenuFontModule) +}; + +// these static variables are by the wxMSWSystemMenuFontModule object +// and reflect the system settings returned by the Win32 API's +// SystemParametersInfo() call. + +wxFont* wxMSWSystemMenuFontModule::ms_systemMenuFont = NULL; +int wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth = 18; // windows clean install default +int wxMSWSystemMenuFontModule::ms_systemMenuHeight = 18; // windows clean install default + +IMPLEMENT_DYNAMIC_CLASS(wxMSWSystemMenuFontModule, wxModule) // ============================================================================ // implementation of wxOwnerDrawn class @@ -45,45 +94,91 @@ // ctor // ---- wxOwnerDrawn::wxOwnerDrawn(const wxString& str, - bool bCheckable, bool WXUNUSED(bMenuItem)) + bool bCheckable, bool bMenuItem) : m_strName(str) { - m_bCheckable = bCheckable; - m_bOwnerDrawn = FALSE; - m_nHeight = 0; - m_nMarginWidth = ms_nLastMarginWidth; - if (wxNORMAL_FONT) - m_font = * wxNORMAL_FONT; + // get the default menu height and font from the system + NONCLIENTMETRICS nm; + nm.cbSize = sizeof (NONCLIENTMETRICS); + SystemParametersInfo (SPI_GETNONCLIENTMETRICS,0,&nm,0); + m_nMinHeight = nm.iMenuHeight; + + // nm.iMenuWidth is the system default for the width of + // menu icons and checkmarks + if (ms_nDefaultMarginWidth == 0) + { + ms_nDefaultMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth; + ms_nLastMarginWidth = wxMSWSystemMenuFontModule::ms_systemMenuButtonWidth; + } + + if (wxMSWSystemMenuFontModule::ms_systemMenuFont->Ok() && bMenuItem) + { + m_font = *wxMSWSystemMenuFontModule::ms_systemMenuFont; + } + else + { + m_font = *wxNORMAL_FONT; + } + + m_bCheckable = bCheckable; + m_bOwnerDrawn = FALSE; + m_nHeight = 0; + m_nMarginWidth = ms_nLastMarginWidth; + m_nMinHeight = wxMSWSystemMenuFontModule::ms_systemMenuHeight; } -#if defined(__WXMSW__) && defined(__WIN32__) && defined(SM_CXMENUCHECK) - size_t wxOwnerDrawn::ms_nDefaultMarginWidth = GetSystemMetrics(SM_CXMENUCHECK); -#else // # what is the reasonable default? - size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 15; -#endif -size_t wxOwnerDrawn::ms_nLastMarginWidth = ms_nDefaultMarginWidth; +// these items will be set during the first invocation of the c'tor, +// because the values will be determined by checking the system settings, +// which is a chunk of code +size_t wxOwnerDrawn::ms_nDefaultMarginWidth = 0; +size_t wxOwnerDrawn::ms_nLastMarginWidth = 0; + // drawing // ------- // get size of the item +// The item size includes the menu string, the accel string, +// the bitmap and size for a submenu expansion arrow... bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) { wxMemoryDC dc; wxString str = wxStripMenuCodes(m_strName); - // # without this menu items look too tightly packed (at least under Windows) - str += wxT('W'); // 'W' is typically the widest letter + // if we have a valid accel string, then pad out + // the menu string so the menu and accel string are not + // placed ontop of eachother. + if ( !m_strAccel.empty() ) + { + str.Pad(str.Length()%8); + str += m_strAccel; + } if (m_font.Ok()) dc.SetFont(GetFont()); dc.GetTextExtent(str, (long *)pwidth, (long *)pheight); - // JACS: items still look too tightly packed, so adding 2 pixels. - (*pheight) = (*pheight) + 2; + 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; + } + + // 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 + *pwidth += (size_t) (GetDefaultMarginWidth() * 1.5); + + // JACS: items still look too tightly packed, so adding 5 pixels. + (*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 @@ -101,14 +196,26 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // Does BMP encroach on default check menu position? size_t adjustedWidth = m_bmpChecked.GetWidth() + (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2); - if (ms_nDefaultMarginWidth < adjustedWidth) - *pwidth += adjustedWidth - ms_nDefaultMarginWidth; +// if (ms_nDefaultMarginWidth < adjustedWidth) +// *pwidth += adjustedWidth - ms_nDefaultMarginWidth; // Do we need to widen margin to fit BMP? - if ((size_t)GetMarginWidth() < adjustedWidth) + if ((size_t)GetMarginWidth() != adjustedWidth) SetMarginWidth(adjustedWidth); + + // add the size of the bitmap to our total size... + *pwidth += GetMarginWidth(); } + // 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 + // tall as the user's system settings specify + if (*pheight < m_nMinHeight) + *pheight = m_nMinHeight; + m_nHeight = *pheight; // remember height for use in OnDrawItem return TRUE; @@ -118,11 +225,7 @@ bool wxOwnerDrawn::OnMeasureItem(size_t *pwidth, size_t *pheight) // Win32 GDI functions and not wxWindows ones. Might help to whoever decides to // port this code to X. (VZ) -// JACS: TODO. Why does a disabled but highlighted item still -// get drawn embossed? How can we tell DrawState that we don't want the -// embossing? - -#if defined(__WIN32__) && !defined(__SC__) && !defined(__TWIN32__) +#if defined(__WIN32__) && !defined(__SYMANTEC__) #define O_DRAW_NATIVE_API // comments below explain why I use it #endif @@ -140,12 +243,31 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, #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 + // be drawn around the bitmap. In most "windows classic" + // applications, a 1-pixel highlight edge is drawn around + // the bitmap of an item when it is selected. However, + // with the new "luna" theme, no edge is drawn around + // the bitmap because the background is white (this applies + // only to "non-XP style" menus w/ bitmaps -- + // see IE 6 menus for an example) + + bool draw_bitmap_edge = true; + // set the colors // -------------- DWORD colBack, colText; if ( st & wxODSelected ) { colBack = GetSysColor(COLOR_HIGHLIGHT); - colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + if (!(st & wxODDisabled)) + { + colText = GetSysColor(COLOR_HIGHLIGHTTEXT); + } + else + { + colText = GetSysColor(COLOR_GRAYTEXT); + } } else { // fall back to default colors if none explicitly specified @@ -153,6 +275,17 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, colText = m_colText.Ok() ? ToRGB(m_colText) : GetSysColor(COLOR_WINDOWTEXT); } + + // if background is white, don't draw an edge around the bitmap + DWORD menu_bg_color = GetSysColor(COLOR_MENU); + if (GetRValue(menu_bg_color) >= 0xf0 && + GetGValue(menu_bg_color) >= 0xf0 && + GetBValue(menu_bg_color) >= 0xf0) + { + draw_bitmap_edge = false; + } + + #ifdef O_DRAW_NATIVE_API #define hdc (HDC)dc.GetHDC() COLORREF colOldText = ::SetTextColor(hdc, colText), @@ -165,8 +298,11 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, // select the font and draw the text // --------------------------------- + // determine where to draw and leave space for a check-mark. - int x = rc.x + GetMarginWidth(); + // Add 3 pixel padding so text appears well within highlight rectangle + int x = rc.x + GetMarginWidth() + 3; + // using native API because it reckognizes '&' #ifdef O_DRAW_NATIVE_API @@ -174,10 +310,15 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, HBRUSH hbr = CreateSolidBrush(colBack), hPrevBrush = (HBRUSH)SelectObject(hdc, hbr); - RECT rectAll = { rc.GetLeft(), rc.GetTop(), rc.GetRight(), rc.GetBottom() }; - FillRect(hdc, &rectAll, hbr); + RECT rectFill = { rc.GetLeft(), rc.GetTop(), rc.GetRight()+1, rc.GetBottom() }; - DeleteObject(hbr); + if ( st & wxODSelected && m_bmpChecked.Ok() && draw_bitmap_edge) { + // only draw the highlight under the text, not under + // the bitmap or checkmark; leave a 1-pixel gap. + rectFill.left = GetMarginWidth() + 1; + } + + FillRect(hdc, &rectFill, hbr); // use default font if no font set HFONT hfont; @@ -190,47 +331,39 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, } HFONT hPrevFont = (HFONT) ::SelectObject(hdc, hfont); - - -#if wxUSE_UNICODE_MSLU - if ( wxGetOsVersion() == wxWIN95 /* using unicows.dll */ ) - { - // VS: There's yet another bug in MSLU: DrawStateW behaves - // like if it was expecting char*, not wchar_t* input. - // We have to use DrawStateA explicitly. - DrawStateA(hdc, NULL, NULL, - (LPARAM)(const char*)m_strName.mb_str(wxConvLocal), - m_strName.length(), - x, rc.y, rc.GetWidth(), rc.GetHeight(), - DST_PREFIXTEXT | - (st & wxODDisabled ? DSS_DISABLED : 0)); - } - else -#else - DrawState(hdc, NULL, NULL, - (LPARAM)m_strName.c_str(), m_strName.length(), - x, rc.y, rc.GetWidth(), rc.GetHeight(), - DST_PREFIXTEXT | (st & wxODDisabled ? DSS_DISABLED : 0)); -#endif - if ( !m_strAccel.empty() ) + wxString strMenuText = m_strName.BeforeFirst('\t'); + + SIZE sizeRect; + GetTextExtentPoint32(hdc,strMenuText.c_str(), strMenuText.Length(),&sizeRect); + ::DrawState(hdc, NULL, NULL, + (LPARAM)strMenuText.c_str(), strMenuText.length(), + x, rc.y+( (int) ((rc.GetHeight()-sizeRect.cy)/2.0) )-1, // centre text vertically + rc.GetWidth()-GetMarginWidth(), sizeRect.cy, + DST_PREFIXTEXT | + (((st & wxODDisabled) && !(st & wxODSelected)) ? DSS_DISABLED : 0)); + + if ( !m_strAccel.empty() ) { - RECT r; - r.top = rc.GetTop(); - r.left = rc.GetLeft(); - r.right = rc.GetRight() - GetMarginWidth(); - r.bottom = rc.GetBottom(); - - DrawText(hdc, m_strAccel, m_strAccel.length(), &r, - DT_SINGLELINE | DT_RIGHT | DT_VCENTER); + // 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); } (void)SelectObject(hdc, hPrevBrush); (void)SelectObject(hdc, hPrevFont); (void)SetBkMode(hdc, nPrevMode); + + DeleteObject(hbr); #else dc.SetFont(GetFont()); - dc.DrawText(m_strName, x, rc.y); + dc.DrawText(wxStripMenuCodes(m_strName), x, rc.y); #endif //O_DRAW_NATIVE_API // draw the bitmap @@ -251,9 +384,7 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, RECT rect = { 0, 0, GetMarginWidth(), m_nHeight }; if ( m_nHeight > 0 ) { -#ifndef __SC__ - DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); -#endif + ::DrawFrameControl(hdcMem, &rect, DFC_MENU, DFCS_MENUCHECK); } // finally copy it to screen DC and clean up @@ -282,25 +413,32 @@ bool wxOwnerDrawn::OnDrawItem(wxDC& dc, // there should be enough place! wxASSERT((nBmpWidth <= rc.GetWidth()) && (nBmpHeight <= rc.GetHeight())); - int heightDiff = (m_nHeight - nBmpHeight); -// if (heightDiff = -1) -// heightDiff = -2; - - //MT: blit with mask enabled. + int heightDiff = m_nHeight - nBmpHeight; dc.Blit(rc.x + (GetMarginWidth() - nBmpWidth) / 2, rc.y + heightDiff / 2, nBmpWidth, nBmpHeight, - &dcMem, 0, 0, wxCOPY, TRUE); + &dcMem, 0, 0, wxCOPY, TRUE /* use mask */); - if ( st & wxODSelected ) { + if ( st & wxODSelected && draw_bitmap_edge ) { #ifdef O_DRAW_NATIVE_API RECT rectBmp = { rc.GetLeft(), rc.GetTop(), rc.GetLeft() + GetMarginWidth(), - rc.GetTop() + m_nHeight }; + rc.GetTop() + m_nHeight-1 }; SetBkColor(hdc, colBack); - DrawEdge(hdc, &rectBmp, EDGE_RAISED, BF_SOFT | BF_RECT); + DrawEdge(hdc, &rectBmp, BDR_RAISEDOUTER, BF_SOFT | BF_RECT); #else - // ## to write portable DrawEdge + 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 } }