X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6cf68971005ab7a0ccee82ffffa2924eeb62f689..53ba4eb40a7107a83393597c41b146971233179d:/src/msw/statusbar.cpp

diff --git a/src/msw/statusbar.cpp b/src/msw/statusbar.cpp
index 8b58819757..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
@@ -156,11 +179,7 @@ wxStatusBar::~wxStatusBar()
     // delete existing tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
-        if (m_tooltips[i])
-        {
-            delete m_tooltips[i];
-            m_tooltips[i] = NULL;
-        }
+        wxDELETE(m_tooltips[i]);
     }
 
     wxDELETE(m_pDC);
@@ -189,11 +208,7 @@ void wxStatusBar::SetFieldsCount(int nFields, const int *widths)
     // reset all current tooltips
     for (size_t i=0; i<m_tooltips.size(); i++)
     {
-        if (m_tooltips[i])
-        {
-            delete m_tooltips[i];
-            m_tooltips[i] = NULL;
-        }
+        wxDELETE(m_tooltips[i]);
     }
 
     // shrink/expand the array:
@@ -212,30 +227,35 @@ 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");
     }
@@ -271,13 +291,8 @@ void wxStatusBar::DoUpdateStatusText(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?
@@ -299,7 +314,7 @@ void wxStatusBar::DoUpdateStatusText(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
@@ -331,8 +346,7 @@ void wxStatusBar::DoUpdateStatusText(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
@@ -345,20 +359,59 @@ void wxStatusBar::DoUpdateStatusText(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)
@@ -399,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;
@@ -425,7 +485,7 @@ wxSize wxStatusBar::DoGetBestSize() const
         }
 
         // add the space between fields
-        width += borders[2];
+        width += borders.between;
     }
 
     if ( !width )
@@ -438,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);