X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7172b423aa146ab9b06e01605887b8deae263f87..9151dcec4f51cf7e9c160ede683cc63392459fea:/src/os2/ownerdrw.cpp diff --git a/src/os2/ownerdrw.cpp b/src/os2/ownerdrw.cpp index a270099a34..6ce8bbf2bd 100644 --- a/src/os2/ownerdrw.cpp +++ b/src/os2/ownerdrw.cpp @@ -6,7 +6,7 @@ // Created: 10/12/99 // RCS-ID: $Id$ // Copyright: (c) David Webster -// Licence: wxWindows license +// Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -18,7 +18,7 @@ #ifndef WX_PRECOMP #include "wx/window.h" - #include "wx/msw/private.h" + #include "wx/os2/private.h" #include "wx/font.h" #include "wx/bitmap.h" #include "wx/dcmemory.h" @@ -28,6 +28,7 @@ #if wxUSE_OWNER_DRAWN +#include "wx/settings.h" #include "wx/ownerdrw.h" #include "wx/menuitem.h" @@ -71,28 +72,100 @@ bool wxOwnerDrawn::OnMeasureItem( { wxMemoryDC vDC; - vDC.SetFont(GetFont()); wxString sStr = wxStripMenuCodes(m_strName); - wxString sTgt = "\t"; - size_t nIndex; - - nIndex = sStr.Find(sTgt.c_str()); - if (nIndex != -1) - sStr.Remove(nIndex); - sTgt = "~"; - nIndex = sStr.Find(sTgt.c_str()); - if (nIndex != -1) - sStr.Replace(sTgt.c_str(), "", TRUE); - + // + // 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() ) + { + sStr.Pad(sStr.Length()%8); + sStr += m_strAccel; + } + vDC.SetFont(GetFont()); vDC.GetTextExtent( sStr ,(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 nAccelWidth; + int nAccelHeight; + + vDC.GetTextExtent( m_strAccel + ,&nAccelWidth + ,&nAccelHeight + ); + *pWidth += nAccelWidth; + } + + // + // 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)(*pWidth + GetDefaultMarginWidth() * 1.5); + + // + // JACS: items still look too tightly packed, so adding 5 pixels. + // + (*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()) + { + // + // Is BMP height larger then text height? + // + size_t nAdjustedHeight = m_bmpChecked.GetHeight() + + wxSystemSettings::GetMetric(wxSYS_EDGE_Y); + if (*pHeight < nAdjustedHeight) + *pHeight = nAdjustedHeight; + + // + // Does BMP encroach on default check menu position? + // + size_t nAdjustedWidth = m_bmpChecked.GetWidth() + + (wxSystemSettings::GetMetric(wxSYS_EDGE_X) * 2); + + // + // Do we need to widen margin to fit BMP? + // + if ((size_t)GetMarginWidth() < nAdjustedWidth) + SetMarginWidth(nAdjustedWidth); - (*pHeight) = (*pHeight) + 2; - m_nHeight = *pHeight; // remember height for use in OnDrawItem + // + // 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; } // end of wxOwnerDrawn::OnMeasureItem @@ -120,7 +193,9 @@ bool wxOwnerDrawn::OnDrawItem( wxColour vColBack; wxColour vColText; COLORREF vRef; - char zMsg[128]; + RECTL vRect = {rRect.x + 4, rRect.y + 1, rRect.x + (rRect.width - 2), rRect.y + rRect.height}; + + memset(&vCbnd, 0, sizeof(CHARBUNDLE)); // // Use default font if no font set @@ -133,17 +208,18 @@ bool wxOwnerDrawn::OnDrawItem( { ::GpiSetCharSet(hPS, LCID_DEFAULT); } + + // + // Base on the status of the menu item pick the right colors + // if (eStatus & wxODSelected) { - vRef = (ULONG)::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENUHILITEBGND // Light gray - ,0L - ); - vColBack.Set( GetRValue(vRef) - ,GetGValue(vRef) - ,GetBValue(vRef) - ); - vColText = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_MENUTEXT); + wxColour vCol2("WHITE"); + vColBack.Set( (unsigned char)0 + ,(unsigned char)0 + ,(unsigned char)160 + ); // no dark blue in color table + vColText = vCol2; } else if (eStatus & wxODDisabled) { @@ -170,7 +246,7 @@ bool wxOwnerDrawn::OnDrawItem( // Fall back to default colors if none explicitly specified // vRef = ::WinQuerySysColor( HWND_DESKTOP - ,SYSCLR_MENU // we are using gray for all our window backgrounds in wxWindows + ,SYSCLR_MENU // we are using gray for all our window backgrounds in wxWidgets ,0L ); vColBack.Set( GetRValue(vRef) @@ -186,24 +262,26 @@ bool wxOwnerDrawn::OnDrawItem( ,GetBValue(vRef) ); } - vRef = vColBack.GetPixel(); - vCbnd.lBackColor = (LONG)vRef; - - vRef = vColText.GetPixel(); - vCbnd.lColor = (LONG)vRef; - - sprintf(zMsg, "Color: %ld", vRef); - wxMessageBox( "wxWindows Menu Sample" - ,zMsg - ,wxICON_INFORMATION - ); + rDC.SetTextBackground(vColBack); + rDC.SetTextForeground(vColText); + rDC.SetBackgroundMode(wxTRANSPARENT); + vCbnd.lColor = vColText.GetPixel(); + vCbnd.lBackColor = vColBack.GetPixel(); ::GpiSetAttrs( hPS ,PRIM_CHAR - ,CBB_COLOR | CBB_BACK_COLOR + ,CBB_BACK_COLOR | CBB_COLOR ,0 ,&vCbnd ); + ::GpiSetBackMix( hPS + ,BM_LEAVEALONE + ); + + // + // Paint the background + // + ::WinFillRect(hPS, &vRect, vColBack.GetPixel()); // // Determine where to draw and leave space for a check-mark. @@ -215,34 +293,106 @@ bool wxOwnerDrawn::OnDrawItem( // drawing methods like ::DrawState that can cleanly handle accel // pneumonics and deal, automatically, with various states, so we have // to handle them ourselves. Notice Win32 can't handle \t in ownerdrawn - // strings either. + // strings either. We cannot handle mneumonics either. We display + // it, though, in hopes we can figure it out some day. + // // - // Manually replace the tab with spaces + // Display main text and accel text separately to allign better // wxString sTgt = "\t"; - wxString sReplace = " "; - size_t nIndex; + wxString sFullString = m_strName; // need to save the original text + wxString sAccel; + int nIndex; + size_t nWidth; + size_t nCharWidth; + size_t nHeight; + bool bFoundMneumonic = FALSE; + bool bFoundAccel = FALSE; - nIndex = m_strName.Find(sTgt.c_str()); + // + // Deal with the tab, extracting the Accel text + // + nIndex = sFullString.Find(sTgt.c_str()); if (nIndex != -1) - m_strName.Replace(sTgt.c_str(), sReplace.c_str(), TRUE); + { + bFoundAccel = TRUE; + sAccel = sFullString.Mid(nIndex + 1); + sFullString.Remove(nIndex); + } + + // + // Deal with the mneumonic character + // sTgt = "~"; - nIndex = m_strName.Find(sTgt.c_str()); + nIndex = sFullString.Find(sTgt.c_str()); if (nIndex != -1) - m_strName.Replace(sTgt.c_str(), "", TRUE); - - POINTL vPoint; + { + wxString sTmp = sFullString; + + bFoundMneumonic = TRUE; + sTmp.Remove(nIndex); + rDC.GetTextExtent( sTmp + ,(long *)&nWidth + ,(long *)&nHeight + ); + sTmp = sFullString[(size_t)(nIndex + 1)]; + rDC.GetTextExtent( sTmp + ,(long *)&nCharWidth + ,(long *)&nHeight + ); + sFullString.Replace(sTgt.c_str(), "", TRUE); + } - vPoint.x = nX; - vPoint.y = rRect.y + 4; - ::GpiCharStringAt( hPS - ,&vPoint - ,m_strName.length() - ,(PCH)m_strName.c_str() + // + // Draw the main item text sans the accel text + // + POINTL vPntStart = {nX, rRect.y + 4}; + ::GpiCharStringAt( rDC.GetHPS() + ,&vPntStart + ,sFullString.length() + ,(PCH)sFullString.c_str() ); + if (bFoundMneumonic) + { + // + // Underline the mneumonic -- still won't work, but at least it "looks" right + // + wxPen vPen; + POINTL vPntEnd = {nX + nWidth + nCharWidth - 3, rRect.y + 2}; //CharWidth is bit wide + + vPntStart.x = nX + nWidth - 1; + vPntStart.y = rRect.y + 2; // Make it look pretty! + vPen = wxPen(vColText, 1, wxSOLID); // Assuming we are always black + rDC.SetPen(vPen); + ::GpiMove(hPS, &vPntStart); + ::GpiLine(hPS, &vPntEnd); + } + + // + // Now draw the accel text + // + if (bFoundAccel) + { + size_t nWidth; + size_t nHeight; + + rDC.GetTextExtent( sAccel + ,(long *)&nWidth + ,(long *)&nHeight + ); + // + // Back off the starting position from the right edge + // + vPntStart.x = rRect.width - (nWidth + 7); + vPntStart.y = rRect.y + 4; + ::GpiCharStringAt( rDC.GetHPS() + ,&vPntStart + ,sAccel.length() + ,(PCH)sAccel.c_str() + ); + } -#if 0 // // Draw the bitmap // --------------- @@ -257,7 +407,7 @@ bool wxOwnerDrawn::OnDrawItem( vRect.xLeft = rRect.x; vRect.xRight = rRect.x + GetMarginWidth(); vRect.yBottom = rRect.y; - vRect.yTop = rRect.y + m_nHeight; + vRect.yTop = rRect.y + m_nHeight - 3; ::WinDrawBitmap( hPS // PS for this menuitem ,hBmpCheck // system checkmark @@ -278,8 +428,14 @@ bool wxOwnerDrawn::OnDrawItem( if (vBmp.Ok()) { + wxMemoryDC vDCMem(&rDC); + wxMemoryDC* pOldDC = (wxMemoryDC*)vBmp.GetSelectedInto(); + if(pOldDC != NULL) + { + vBmp.SetSelectedInto(NULL); + } vDCMem.SelectObject(vBmp); // @@ -293,11 +449,10 @@ bool wxOwnerDrawn::OnDrawItem( // wxASSERT((nBmpWidth <= rRect.width) && (nBmpHeight <= rRect.height)); - // - //MT: blit with mask enabled. - // + int nHeightDiff = m_nHeight - nBmpHeight; + rDC.Blit( rRect.x + (GetMarginWidth() - nBmpWidth) / 2 - ,rRect.y + (m_nHeight - nBmpHeight) /2 + ,rRect.y + nHeightDiff / 2 ,nBmpWidth ,nBmpHeight ,&vDCMem @@ -309,30 +464,29 @@ bool wxOwnerDrawn::OnDrawItem( if (eStatus & wxODSelected) { - RECT vRectBmp = { rRect.x - ,rRect.y - ,rRect.x + GetMarginWidth() - ,rRect.y + m_nHeight - }; + POINTL vPnt1 = {rRect.x + 1, rRect.y + 3}; // Leave a little background border + POINTL vPnt2 = {rRect.x + GetMarginWidth(), rRect.y + m_nHeight - 3}; + LINEBUNDLE vLine; - vLine.lColor = lColBack; + vLine.lColor = vColBack.GetPixel(); ::GpiSetAttrs( hPS ,PRIM_LINE ,LBB_COLOR ,0 ,&vLine ); + ::GpiMove(hPS, &vPnt1); ::GpiBox( hPS ,DRO_OUTLINE - ,(PPOINTL)&vRectBmp + ,&vPnt2 ,0L ,0L ); } + vBmp.SetSelectedInto(NULL); } } -#endif return TRUE; } // end of wxOwnerDrawn::OnDrawItem