X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..e75390d4aa51b46b9217dc4699267c1345893054:/src/msw/statusbar.cpp diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp index 72da7d9980..d0fe3d05fc 100644 --- a/src/msw/statusbar.cpp +++ b/src/msw/statusbar.cpp @@ -9,6 +9,14 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +// ============================================================================ +// declarations +// ============================================================================ + +// ---------------------------------------------------------------------------- +// headers +// ---------------------------------------------------------------------------- + // for compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -38,8 +46,17 @@ #include "wx/msw/uxtheme.h" #endif +// ---------------------------------------------------------------------------- +// constants +// ---------------------------------------------------------------------------- + +namespace +{ + // no idea for a default width, just choose something -#define DEFAULT_FIELD_WIDTH 25 +static const int DEFAULT_FIELD_WIDTH = 25; + +} // anonymous namespace // ---------------------------------------------------------------------------- // macros @@ -126,7 +143,7 @@ bool wxStatusBar::Create(wxWindow *parent, SetFieldsCount(1); SubclassWin(m_hWnd); - // cache the DC instance used by UpdateFieldText: + // cache the DC instance used by DoUpdateStatusText: // NOTE: create the DC before calling InheritAttributes() since // it may result in a call to our SetFont() m_pDC = new wxClientDC(this); @@ -182,7 +199,7 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths) wxStatusBarBase::SetFieldsCount(nFields, widths); - SetFieldsWidth(); + MSWUpdateFieldsWidths(); // keep in synch also our m_tooltips array @@ -204,38 +221,43 @@ void wxStatusBar::SetStatusWidths(int n, const int widths[]) { wxStatusBarBase::SetStatusWidths(n, widths); - SetFieldsWidth(); + MSWUpdateFieldsWidths(); } -void wxStatusBar::SetFieldsWidth() +void wxStatusBar::MSWUpdateFieldsWidths() { if ( m_panes.IsEmpty() ) return; - int aBorders[3]; - SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders); + const int count = m_panes.GetCount(); + + const int extraWidth = MSWGetBorderWidth() + MSWGetMetrics().textMargin; - int extraWidth = aBorders[2]; // space between fields + // compute the effectively available amount of space: + int widthAvailable = GetClientSize().x; // start with the entire width + widthAvailable -= extraWidth*(count - 1); // extra space between fields + widthAvailable -= MSWGetMetrics().textMargin; // and for the last field + if ( HasFlag(wxSTB_SIZEGRIP) ) + widthAvailable -= MSWGetMetrics().gripWidth; // distribute the available space (client width) among the various fields: - wxArrayInt widthsAbs = - CalculateAbsWidths(GetClientSize().x - extraWidth*(m_panes.GetCount() - 1)); + wxArrayInt widthsAbs = CalculateAbsWidths(widthAvailable); // update the field widths in the native control: - int *pWidths = new int[m_panes.GetCount()]; + int *pWidths = new int[count]; int nCurPos = 0; - for ( size_t i = 0; i < m_panes.GetCount(); i++ ) + for ( int i = 0; i < count; i++ ) { nCurPos += widthsAbs[i] + extraWidth; pWidths[i] = nCurPos; } - if ( !StatusBar_SetParts(GetHwnd(), m_panes.GetCount(), pWidths) ) + if ( !StatusBar_SetParts(GetHwnd(), count, pWidths) ) { wxLogLastError("StatusBar_SetParts"); } @@ -243,26 +265,10 @@ void wxStatusBar::SetFieldsWidth() delete [] pWidths; - // FIXME: we may want to call UpdateFieldText() here since we may need to (de)ellipsize status texts -} - -void wxStatusBar::SetStatusText(const wxString& strText, int nField) -{ - wxCHECK_RET( (nField >= 0) && ((size_t)nField < m_panes.GetCount()), - "invalid statusbar field index" ); - - if ( strText == GetStatusText(nField) ) - { - // don't call StatusBar_SetText() to avoid flicker - return; - } - - wxStatusBarBase::SetStatusText(strText, nField); - - UpdateFieldText(nField); + // FIXME: we may want to call DoUpdateStatusText() here since we may need to (de)ellipsize status texts } -void wxStatusBar::UpdateFieldText(int nField) +void wxStatusBar::DoUpdateStatusText(int nField) { if (!m_pDC) return; @@ -287,13 +293,8 @@ void wxStatusBar::UpdateFieldText(int nField) wxRect rc; GetFieldRect(nField, rc); - int margin; - if (nField == GetFieldsCount()-1) - margin = -6; // windows reports a smaller rect for the last field; enlarge it - else - margin = 4; + const int maxWidth = rc.GetWidth() - MSWGetMetrics().textMargin; - int maxWidth = rc.GetWidth() - margin; // leave a small margin wxString text = GetStatusText(nField); // do we need to ellipsize this string? @@ -315,7 +316,7 @@ void wxStatusBar::UpdateFieldText(int nField) *m_pDC, ellmode, maxWidth, - wxELLIPSIZE_EXPAND_TAB); + wxELLIPSIZE_FLAGS_EXPAND_TABS); // update the ellipsization status for this pane; this is used later to // decide whether a tooltip should be shown or not for this pane @@ -361,20 +362,59 @@ void wxStatusBar::UpdateFieldText(int nField) } } -int wxStatusBar::GetBorderX() const +wxStatusBar::MSWBorders wxStatusBar::MSWGetBorders() const { int aBorders[3]; SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders); - return aBorders[0]; + MSWBorders borders; + borders.horz = aBorders[0]; + borders.vert = aBorders[1]; + borders.between = aBorders[2]; + return borders; +} + +int wxStatusBar::GetBorderX() const +{ + return MSWGetBorders().horz; } int wxStatusBar::GetBorderY() const { - int aBorders[3]; - SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)aBorders); + return MSWGetBorders().vert; +} + +int wxStatusBar::MSWGetBorderWidth() const +{ + return MSWGetBorders().between; +} + +/* static */ +const wxStatusBar::MSWMetrics& wxStatusBar::MSWGetMetrics() +{ + static MSWMetrics s_metrics = { 0 }; + if ( !s_metrics.textMargin ) + { + // Grip size should be self explanatory (the only problem with it is + // that it's hard coded as we don't know how to find its size using + // API) but the margin might merit an explanation: Windows offsets the + // text drawn in status bar panes so we need to take this extra margin + // into account to make sure the text drawn by user fits inside the + // pane. Notice that it's not the value returned by SB_GETBORDERS + // which, at least on this Windows 2003 system, returns {0, 2, 2} + if ( wxUxThemeEngine::GetIfActive() ) + { + s_metrics.gripWidth = 20; + s_metrics.textMargin = 8; + } + else // classic/unthemed look + { + s_metrics.gripWidth = 18; + s_metrics.textMargin = 4; + } + } - return aBorders[1]; + return s_metrics; } void wxStatusBar::SetMinHeight(int height) @@ -415,13 +455,20 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const wxCopyRECTToRect(r, rect); + // Windows seems to under-report the size of the last field rectangle, + // presumably in order to prevent the buggy applications from overflowing + // onto the size grip but we want to return the real size to wx users + if ( HasFlag(wxSTB_SIZEGRIP) && i == (int)m_panes.GetCount() - 1 ) + { + rect.width += MSWGetMetrics().gripWidth - MSWGetBorderWidth(); + } + return true; } wxSize wxStatusBar::DoGetBestSize() const { - int borders[3]; - SendMessage(GetHwnd(), SB_GETBORDERS, 0, (LPARAM)borders); + const MSWBorders borders = MSWGetBorders(); // calculate width int width = 0; @@ -441,7 +488,7 @@ wxSize wxStatusBar::DoGetBestSize() const } // add the space between fields - width += borders[2]; + width += borders.between; } if ( !width ) @@ -454,7 +501,7 @@ wxSize wxStatusBar::DoGetBestSize() const int height; wxGetCharSize(GetHWND(), NULL, &height, GetFont()); height = EDIT_HEIGHT_FROM_CHAR_HEIGHT(height); - height += borders[1]; + height += borders.vert; wxSize best(width, height); CacheBestSize(best); @@ -482,7 +529,7 @@ void wxStatusBar::DoMoveWindow(int x, int y, int width, int height) } // adjust fields widths to the new size - SetFieldsWidth(); + MSWUpdateFieldsWidths(); // we have to trigger wxSizeEvent if there are children window in status // bar because GetFieldRect returned incorrect (not updated) values up to @@ -580,7 +627,7 @@ wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) if ( nMsg == WM_SIZE && needsEllipsization ) { for (int i=0; i