X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6418ad5ec8e66c3b367b59b56e0849399774f3ec..edae63b0769fab90e3a64d0e211ae3090b6120c8:/src/msw/statusbar.cpp?ds=sidebyside diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp index 6d9ddf992d..a7031f4f51 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 @@ -87,6 +104,12 @@ bool wxStatusBar::Create(wxWindow *parent, if ( style & wxCLIP_SIBLINGS ) wstyle |= WS_CLIPSIBLINGS; + // wxSTB_SIZEGRIP is part of our default style but it doesn't make sense to + // show size grip if this is the status bar of a non-resizeable TLW so turn + // it off in such case + if ( parent->IsTopLevel() && !parent->HasFlag(wxRESIZE_BORDER) ) + style &= ~wxSTB_SIZEGRIP; + // setting SBARS_SIZEGRIP is perfectly useless: it's always on by default // (at least in the version of comctl32.dll I'm using), and the only way to // turn it off is to use CCS_TOP style - as we position the status bar @@ -108,7 +131,7 @@ bool wxStatusBar::Create(wxWindow *parent, m_hWnd = CreateWindow ( STATUSCLASSNAME, - _T(""), + wxT(""), wstyle, 0, 0, 0, 0, GetHwndOf(parent), @@ -126,7 +149,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); @@ -153,6 +176,12 @@ wxStatusBar::~wxStatusBar() // occupy PostSizeEventToParent(); + // delete existing tooltips + for (size_t i=0; i= 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); -} - -void wxStatusBar::UpdateFieldText(int nField) +void wxStatusBar::DoUpdateStatusText(int nField) { if (!m_pDC) return; @@ -272,13 +291,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? @@ -296,22 +310,24 @@ void wxStatusBar::UpdateFieldText(int nField) } else { - text = wxControl::Ellipsize(text, + text = wxControl::Ellipsize(text, *m_pDC, ellmode, maxWidth, - wxELLIPSIZE_EXPAND_TAB); - - // update the ellipsization status for this pane; this is used later to - // decide whether a tooltip should be shown or not for this pane + 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 // (if we have wxSTB_SHOW_TIPS) SetEllipsizedFlag(nField, text != GetStatusText(nField)); } - // Set the status text in the native control passing both field number and style. + // Set the status text in the native control passing both field number and style. // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed' if ( !StatusBar_SetText(GetHwnd(), nField | style, text.wx_str()) ) + { wxLogLastError("StatusBar_SetText"); + } if (HasFlag(wxSTB_SHOW_TIPS)) { @@ -330,8 +346,7 @@ void wxStatusBar::UpdateFieldText(int nField) else { // delete the tooltip associated with this pane; it's not needed anymore - delete m_tooltips[nField]; - m_tooltips[nField] = NULL; + wxDELETE(m_tooltips[nField]); } } else @@ -344,20 +359,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; +} - return aBorders[1]; +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 s_metrics; } void wxStatusBar::SetMinHeight(int height) @@ -375,7 +429,9 @@ bool wxStatusBar::GetFieldRect(int i, wxRect& rect) const RECT r; if ( !::SendMessage(GetHwnd(), SB_GETRECT, i, (LPARAM)&r) ) + { wxLogLastError("SendMessage(SB_GETRECT)"); + } #if wxUSE_UXTHEME wxUxThemeHandle theme(const_cast(this), L"Status"); @@ -396,13 +452,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; @@ -422,7 +485,7 @@ wxSize wxStatusBar::DoGetBestSize() const } // add the space between fields - width += borders[2]; + width += borders.between; } if ( !width ) @@ -435,7 +498,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); @@ -463,7 +526,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 @@ -501,11 +564,13 @@ void wxStatusBar::SetStatusStyles(int n, const int styles[]) } // The SB_SETTEXT message is both used to set the field's text as well as - // the fields' styles. + // the fields' styles. // NOTE: MSDN library doesn't mention that nField and style have to be 'ORed' wxString text = GetStatusText(i); if (!StatusBar_SetText(GetHwnd(), style | i, text.wx_str())) + { wxLogLastError("StatusBar_SetText"); + } } } @@ -559,7 +624,7 @@ wxStatusBar::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) if ( nMsg == WM_SIZE && needsEllipsization ) { for (int i=0; i