X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/78612fa68fdeb01b2cb0fa8b2b89fc8924bb71ff..9b49405777342458dc1666001865eef7309b6c30:/src/generic/statusbr.cpp?ds=sidebyside diff --git a/src/generic/statusbr.cpp b/src/generic/statusbr.cpp index a7202cf210..1264843946 100644 --- a/src/generic/statusbr.cpp +++ b/src/generic/statusbr.cpp @@ -24,6 +24,7 @@ #include "wx/settings.h" #include "wx/dcclient.h" #include "wx/toplevel.h" + #include "wx/control.h" #endif #ifdef __WXGTK20__ @@ -54,6 +55,7 @@ BEGIN_EVENT_TABLE(wxStatusBarGeneric, wxWindow) EVT_PAINT(wxStatusBarGeneric::OnPaint) + EVT_SIZE(wxStatusBarGeneric::OnSize) EVT_LEFT_DOWN(wxStatusBarGeneric::OnLeftDown) EVT_RIGHT_DOWN(wxStatusBarGeneric::OnRightDown) EVT_SYS_COLOUR_CHANGED(wxStatusBarGeneric::OnSysColourChanged) @@ -89,16 +91,7 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, SetFont(*wxSMALL_FONT); #endif - wxCoord y; - { - // Set the height according to the font and the border size - wxClientDC dc(this); - dc.SetFont(GetFont()); - - dc.GetTextExtent(_T("X"), NULL, &y ); - } - int height = (int)( (11*y)/10 + 2*GetBorderY()); - + int height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height); SetFieldsCount(1); @@ -109,16 +102,15 @@ bool wxStatusBarGeneric::Create(wxWindow *parent, wxSize wxStatusBarGeneric::DoGetBestSize() const { int width, height; - wxCoord y; // best width is the width of the parent - GetParent()->GetClientSize(&width, NULL); + if (GetParent()) + GetParent()->GetClientSize(&width, NULL); + else + width = 80; // a dummy value // best height is as calculated above in Create() - wxClientDC dc((wxWindow*)this); - dc.SetFont(GetFont()); - dc.GetTextExtent(_T("X"), NULL, &y); - height = (int)((11*y)/10 + 2*GetBorderY()); + height = (int)((11*GetCharHeight())/10 + 2*GetBorderY()); return wxSize(width, height); } @@ -127,21 +119,9 @@ void wxStatusBarGeneric::SetFieldsCount(int number, const int *widths) { wxASSERT_MSG( number >= 0, _T("negative number of fields in wxStatusBar?") ); - // enlarge the m_statusStrings array if needed: - for (size_t i = m_panes.GetCount(); i < (size_t)number; ++i) - m_statusStrings.Add( wxEmptyString ); - - // shrink the m_statusStrings array if needed: - for (int j = (int)m_panes.GetCount() - 1; j >= number; --j) - m_statusStrings.RemoveAt(j); - - // forget the old cached pixel widths - m_widthsAbs.Empty(); - + // this will result in a call to SetStatusWidths() and thus an update to our + // m_widthsAbs cache wxStatusBarBase::SetFieldsCount(number, widths); - - wxASSERT_MSG( m_panes.GetCount() == m_statusStrings.GetCount(), - _T("This really should never happen, can we do away with m_panes.GetCount() here?") ); } void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) @@ -149,10 +129,10 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) wxCHECK_RET( (number >= 0) && ((size_t)number < m_panes.GetCount()), _T("invalid status bar field index") ); - wxString oldText = m_statusStrings[number]; + wxString oldText = GetStatusText(number); if (oldText != text) { - m_statusStrings[number] = text; + wxStatusBarBase::SetStatusText(text, number); wxRect rect; GetFieldRect(number, rect); @@ -166,23 +146,17 @@ void wxStatusBarGeneric::SetStatusText(const wxString& text, int number) } } -wxString wxStatusBarGeneric::GetStatusText(int n) const -{ - wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), wxEmptyString, - _T("invalid status bar field index") ); - - return m_statusStrings[n]; -} - void wxStatusBarGeneric::SetStatusWidths(int n, const int widths_field[]) { // only set status widths when n == number of statuswindows wxCHECK_RET( (size_t)n == m_panes.GetCount(), _T("status bar field count mismatch") ); - // forget the old cached pixel widths - m_widthsAbs.Empty(); - wxStatusBarBase::SetStatusWidths(n, widths_field); + + // update cache + int width; + GetClientSize(&width, &m_lastClientHeight); + m_widthsAbs = CalculateAbsWidths(width); } bool wxStatusBarGeneric::ShowsSizeGrip() const @@ -195,13 +169,15 @@ bool wxStatusBarGeneric::ShowsSizeGrip() const return tlw && !tlw->IsMaximized() && tlw->HasFlag(wxRESIZE_BORDER); } -void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) +void wxStatusBarGeneric::DrawFieldText(wxDC& dc, const wxRect& rect, int i, int textHeight) { - wxRect rect; - GetFieldRect(i, rect); + wxString text(GetStatusText(i)); + if (text.empty()) + return; // optimization - if (rect.GetWidth() <= 0) - return; // happens when the status bar is shrinked in a very small area! + int xpos = rect.x + wxFIELD_TEXT_MARGIN, + maxWidth = rect.width - 2*wxFIELD_TEXT_MARGIN, + ypos = (int) (((rect.height - textHeight) / 2) + rect.y + 0.5); if (ShowsSizeGrip()) { @@ -210,36 +186,28 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) // work because the adjustment needs to be done only when drawing // the field text and not also when drawing the background, the // size grip itself, etc - if (GetLayoutDirection() == wxLayout_RightToLeft && i == 0) + if ((GetLayoutDirection() == wxLayout_RightToLeft && i == 0) || + (GetLayoutDirection() != wxLayout_RightToLeft && + i == (int)m_panes.GetCount()-1)) { - const wxRect& rc = GetSizeGripRect(); + const wxRect& gripRc = GetSizeGripRect(); - rect.x += rc.GetRight(); - rect.width -= rc.GetRight(); - } - else if (GetLayoutDirection() != wxLayout_RightToLeft && i == m_panes.GetCount()-1) - { - const wxRect& rc = GetSizeGripRect(); + // NOTE: we don't need any special treatment wrt to the layout direction + // since DrawText() will automatically adjust the origin of the + // text accordingly to the layout in use - rect.width = rc.x - rect.x; + maxWidth -= gripRc.width; } } // eventually ellipsize the text so that it fits the field width - wxString text(GetStatusText(i)); - text = wxControl::Ellipsize( text, dc, GetLayoutDirection() == wxLayout_RightToLeft ? wxELLIPSIZE_START : wxELLIPSIZE_END, - rect.GetWidth() - 2*wxFIELD_TEXT_MARGIN, + maxWidth, wxELLIPSIZE_EXPAND_TAB); // Ellipsize() will do something only if necessary - // center the text in its field - wxSize sz = dc.GetTextExtent(text); - int xpos = rect.x + wxFIELD_TEXT_MARGIN; - int ypos = (int) (((rect.height - sz.GetHeight()) / 2) + rect.y + 0.5); - #if defined( __WXGTK__ ) || defined(__WXMAC__) xpos++; ypos++; @@ -249,12 +217,15 @@ void wxStatusBarGeneric::DrawFieldText(wxDC& dc, int i) dc.DrawText(text, xpos, ypos); } -void wxStatusBarGeneric::DrawField(wxDC& dc, int i) +void wxStatusBarGeneric::DrawField(wxDC& dc, int i, int textHeight) { wxRect rect; GetFieldRect(i, rect); - int style = m_panes[i].nStyle; + if (rect.GetWidth() <= 0) + return; // happens when the status bar is shrinked in a very small area! + + int style = m_panes[i].GetStyle(); if (style != wxSB_FLAT) { // Draw border @@ -294,11 +265,10 @@ void wxStatusBarGeneric::DrawField(wxDC& dc, int i) rect.x + rect.width, rect.y); dc.DrawLine(rect.x, rect.y + rect.height, rect.x, rect.y); - #endif } - DrawFieldText(dc, i); + DrawFieldText(dc, rect, i, textHeight); } // Get the position and size of the field's internal bounding rectangle @@ -307,36 +277,17 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const wxCHECK_MSG( (n >= 0) && ((size_t)n < m_panes.GetCount()), false, _T("invalid status bar field index") ); - // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ) - int width, height; -#ifdef __WXPM__ - GetSize(&width, &height); -#else - GetClientSize(&width, &height); -#endif - - // we cache m_widthsAbs between calls and recompute it if client - // width has changed (or when it is initially empty) - if ( m_widthsAbs.IsEmpty() || m_lastClientWidth != width ) - { - // FIXME: why don't we use an OnSize(wxSizeEvent&) event handler to - // update the cache? (FM) - - wxConstCast(this, wxStatusBarGeneric)->m_widthsAbs = CalculateAbsWidths(width); - - // remember last width for which we have recomputed the widths in pixels - wxConstCast(this, wxStatusBarGeneric)->m_lastClientWidth = width; - } + if (m_widthsAbs.IsEmpty()) + return false; rect.x = 0; for ( int i = 0; i < n; i++ ) rect.x += m_widthsAbs[i]; - rect.x += m_borderX; - rect.y = m_borderY; + rect.y = m_borderY; rect.width = m_widthsAbs[n] - 2*m_borderX; - rect.height = height - 2*m_borderY; + rect.height = m_lastClientHeight - 2*m_borderY; return true; } @@ -345,7 +296,7 @@ bool wxStatusBarGeneric::GetFieldRect(int n, wxRect& rect) const void wxStatusBarGeneric::InitColours() { #if defined(__WXPM__) - m_mediumShadowPen = wxPen(wxColour(127, 127, 127), 1, wxSOLID); + m_mediumShadowPen = wxPen(wxColour(127, 127, 127)); m_hilightPen = *wxWHITE_PEN; SetBackgroundColour(*wxLIGHT_GREY); @@ -359,15 +310,11 @@ void wxStatusBarGeneric::InitColours() void wxStatusBarGeneric::SetMinHeight(int height) { // check that this min height is not less than minimal height for the - // current font - wxClientDC dc(this); - wxCoord y; - dc.GetTextExtent( wxT("X"), NULL, &y ); + // current font (min height is as calculated above in Create() except for border) + int minHeight = (int)((11*GetCharHeight())/10); - if ( height > (11*y)/10 ) - { + if ( height > minHeight ) SetSize(wxDefaultCoord, wxDefaultCoord, wxDefaultCoord, height + 2*m_borderY); - } } wxRect wxStatusBarGeneric::GetSizeGripRect() const @@ -411,10 +358,12 @@ void wxStatusBarGeneric::OnPaint(wxPaintEvent& WXUNUSED(event) ) if (GetFont().IsOk()) dc.SetFont(GetFont()); - dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); + // compute char height only once for all panes: + int textHeight = dc.GetCharHeight(); + dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT); for (size_t i = 0; i < m_panes.GetCount(); i ++) - DrawField(dc, i); + DrawField(dc, i, textHeight); } // Responds to colour changes, and passes event on to children. @@ -507,4 +456,18 @@ void wxStatusBarGeneric::OnRightDown(wxMouseEvent& event) #endif } +void wxStatusBarGeneric::OnSize(wxSizeEvent& WXUNUSED(event)) +{ + // FIXME: workarounds for OS/2 bugs have nothing to do here (VZ) + int width; +#ifdef __WXPM__ + GetSize(&width, &m_lastClientHeight); +#else + GetClientSize(&width, &m_lastClientHeight); +#endif + + // recompute the cache of the field widths if the status bar width has changed + m_widthsAbs = CalculateAbsWidths(width); +} + #endif // wxUSE_STATUSBAR