X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c93e68a85aeb866bcb13ba801399af660f22d44f..a78d2fbab115b4c6537349fb06275d1610bf4aa0:/src/generic/renderg.cpp

diff --git a/src/generic/renderg.cpp b/src/generic/renderg.cpp
index baf845cb63..0024bcec60 100644
--- a/src/generic/renderg.cpp
+++ b/src/generic/renderg.cpp
@@ -6,7 +6,7 @@
 // Created:     20.07.2003
 // RCS-ID:      $Id$
 // Copyright:   (c) 2003 Vadim Zeitlin <vadim@wxwindows.org>
-// License:     wxWindows license
+// Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -32,6 +32,7 @@
     #include "wx/settings.h"
     #include "wx/gdicmn.h"
     #include "wx/module.h"
+    #include "wx/control.h"
 #endif //WX_PRECOMP
 
 #include "wx/splitter.h"
@@ -66,6 +67,8 @@ public:
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
 
+    virtual int GetHeaderButtonMargin(wxWindow *win);
+
     virtual void DrawTreeItemButton(wxWindow *win,
                                     wxDC& dc,
                                     const wxRect& rect,
@@ -182,10 +185,7 @@ wxRendererNative& wxRendererNative::GetGeneric()
 
 void wxRendererGeneric::Cleanup()
 {
-    if (sm_rendererGeneric)
-        delete sm_rendererGeneric;
-
-    sm_rendererGeneric = NULL;
+    wxDELETE(sm_rendererGeneric);
 }
 
 wxRendererGeneric* wxRendererGeneric::sm_rendererGeneric = NULL;
@@ -324,53 +324,61 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
 
         wxColour c = (params && params->m_arrowColour.Ok()) ?
             params->m_arrowColour : wxSystemSettings::GetColour(wxSYS_COLOUR_3DSHADOW);
-        dc.SetPen(wxPen(c));
-        dc.SetBrush(wxBrush(c));
+
+        wxDCPenChanger setPen(dc, c);
+        wxDCBrushChanger setBrush(dc, c);
+
+        wxDCClipper clip(dc, rect);
         dc.DrawPolygon( 3, triPt, ar.x, ar.y);
     }
     labelWidth += arrowSpace;
 
-    const int margin = 5;   // number of pixels to reserve on either side of the label
     int bmpWidth = 0;
 
-    if ( params && params->m_labelBitmap.Ok() )
-        bmpWidth = params->m_labelBitmap.GetWidth() + 2;
-
-    labelWidth += bmpWidth + 2*margin;
-
     // draw the bitmap if there is one
     if ( params && params->m_labelBitmap.Ok() )
     {
-        int w, h, x, y;
-        w = params->m_labelBitmap.GetWidth();
-        h = params->m_labelBitmap.GetHeight();
+        int w = params->m_labelBitmap.GetWidth();
+        int h = params->m_labelBitmap.GetHeight();
+
+        const int margin = 1; // an extra pixel on either side of the bitmap
+
+        bmpWidth = w + 2*margin;
+        labelWidth += bmpWidth;
 
-        x = margin + rect.x;
-        y = rect.y + wxMax(1, (rect.height - h) / 2);
+        int x = rect.x + margin;
+        const int y = rect.y + wxMax(1, (rect.height - h) / 2);
 
-        if (params->m_labelText.empty())
+        const int extraSpace = rect.width - labelWidth;
+        if ( params->m_labelText.empty() && extraSpace > 0 )
         {
             // use the alignment flags
             switch (params->m_labelAlignment)
             {
                 default:
                 case wxALIGN_LEFT:
-                    x = rect.x + margin;
                     break;
+
                 case wxALIGN_CENTER:
-                    x = rect.x + wxMax(1, (rect.width - arrowSpace - w)/2);
+                    x += extraSpace/2;
                     break;
+
                 case wxALIGN_RIGHT:
-                    x = rect.x + wxMax(1, rect.width - arrowSpace - margin - w);
+                    x += extraSpace;
                     break;
             }
         }
+
+        wxDCClipper clip(dc, rect);
         dc.DrawBitmap(params->m_labelBitmap, x, y, true);
     }
 
     // Draw a label if one is given
     if ( params && !params->m_labelText.empty() )
     {
+        const int margin = 5;   // number of pixels to reserve on either side of the label
+        labelWidth += 2*margin;
+
         wxFont font  = params->m_labelFont.Ok() ?
             params->m_labelFont : win->GetFont();
         wxColour clr = params->m_labelColour.Ok() ?
@@ -382,41 +390,48 @@ wxRendererGeneric::DrawHeaderButtonContents(wxWindow *win,
         dc.SetTextForeground(clr);
         dc.SetBackgroundMode(wxBRUSHSTYLE_TRANSPARENT);
 
-        int tw, th, td, x, y;
+        int tw, th, td;
         dc.GetTextExtent( label, &tw, &th, &td);
-        labelWidth += tw;
-        y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
+
+        int x = rect.x + bmpWidth + margin;
+        const int y = rect.y + wxMax(0, (rect.height - (th+td)) / 2);
 
         // truncate and add an ellipsis (...) if the text is too wide.
-        int targetWidth = rect.width - arrowSpace - bmpWidth - 2*margin;
-        if ( tw > targetWidth )
+        const int availWidth = rect.width - labelWidth;
+#if wxUSE_CONTROLS
+        if ( tw > availWidth )
         {
-            int ellipsisWidth;
-            dc.GetTextExtent( wxT("..."), &ellipsisWidth, NULL);
-            do {
-                label.Truncate( label.length() - 1 );
-                dc.GetTextExtent( label, &tw, &th);
-            } while (tw + ellipsisWidth > targetWidth && label.length() );
-            label.append( wxT("...") );
-            tw += ellipsisWidth;
+            label = wxControl::Ellipsize(label,
+                                         dc,
+                                         wxELLIPSIZE_END,
+                                         availWidth,
+                                         wxELLIPSIZE_FLAGS_NONE);
+            tw = dc.GetTextExtent(label).x;
         }
-
-        switch (params->m_labelAlignment)
+        else // enough space, we can respect alignment
+#endif // wxUSE_CONTROLS
         {
-            default:
-            case wxALIGN_LEFT:
-                x = rect.x + margin;
-                break;
-            case wxALIGN_CENTER:
-                x = rect.x + wxMax(0, (rect.width - arrowSpace  - tw - bmpWidth)/2);
-                break;
-            case wxALIGN_RIGHT:
-                x = rect.x + wxMax(0, rect.width - arrowSpace - margin - tw - bmpWidth);
-                break;
+            switch (params->m_labelAlignment)
+            {
+                default:
+                case wxALIGN_LEFT:
+                    break;
+
+                case wxALIGN_CENTER:
+                    x += (availWidth - tw)/2;
+                    break;
+
+                case wxALIGN_RIGHT:
+                    x += availWidth - tw;
+                    break;
+            }
         }
 
-        dc.DrawText(label, x + bmpWidth, y);
+        dc.DrawText(label, x, y);
+
+        labelWidth += tw;
     }
+
     return labelWidth;
 }
 
@@ -434,6 +449,11 @@ int wxRendererGeneric::GetHeaderButtonHeight(wxWindow *win)
     return h + d + 2 * HEADER_OFFSET_Y + EXTRA_HEIGHT;
 }
 
+int wxRendererGeneric::GetHeaderButtonMargin(wxWindow *WXUNUSED(win))
+{
+    return 5;
+}
+
 
 // draw the plus or minus sign
 void