fix off by one (or rather "off by border width") bug in ScrollWindow() (part of patch...

[wxWidgets.git] / src / mac / carbon / renderer.cpp

diff --git a/src/mac/carbon/renderer.cpp b/src/mac/carbon/renderer.cpp
index 71bb87221e37279299d2e4c22329ac2ee327d929..e0f9bc23e2f4734b4eb8e1cac2bf0d7226c5f01e 100644 (file)
--- a/src/mac/carbon/renderer.cpp
+++ b/src/mac/carbon/renderer.cpp
@@ -34,7 +34,7 @@ class WXDLLEXPORT wxRendererMac : public wxDelegateRendererNative
 {
 public:
     // draw the header control button (used by wxListCtrl)
 {
 public:
     // draw the header control button (used by wxListCtrl)

-    virtual void DrawHeaderButton( wxWindow *win,
+    virtual int DrawHeaderButton( wxWindow *win,

         wxDC& dc,
         const wxRect& rect,
         int flags = 0,
         wxDC& dc,
         const wxRect& rect,
         int flags = 0,


@@ -42,7 +42,7 @@ public:
         wxHeaderButtonParams* params = NULL );
 
     virtual int GetHeaderButtonHeight(wxWindow *win);
         wxHeaderButtonParams* params = NULL );
 
     virtual int GetHeaderButtonHeight(wxWindow *win);

-    
+

     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton( wxWindow *win,
         wxDC& dc,
     // draw the expanded/collapsed icon for a tree control item
     virtual void DrawTreeItemButton( wxWindow *win,
         wxDC& dc,


@@ -56,13 +56,32 @@ public:
         wxCoord position,
         wxOrientation orient,
         int flags = 0 );
         wxCoord position,
         wxOrientation orient,
         int flags = 0 );

-        
+
+    virtual void DrawComboBoxDropButton(wxWindow *win,
+                                        wxDC& dc,
+                                        const wxRect& rect,
+                                        int flags = 0);
+
+    virtual void DrawPushButton(wxWindow *win,
+                                wxDC& dc,
+                                const wxRect& rect,
+                                int flags = 0);
+

     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
                                        int flags = 0);
 
     virtual void DrawItemSelectionRect(wxWindow *win,
                                        wxDC& dc,
                                        const wxRect& rect,
                                        int flags = 0);
 

+    virtual void DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags = 0);
+

 private:
 private:

+    void DrawMacThemeButton(wxWindow *win,
+                            wxDC& dc,
+                            const wxRect& rect,
+                            int flags,
+                            int kind,
+                            int adornment);
+

     // the tree buttons
     wxBitmap m_bmpTreeExpanded;
     wxBitmap m_bmpTreeCollapsed;
     // the tree buttons
     wxBitmap m_bmpTreeExpanded;
     wxBitmap m_bmpTreeCollapsed;


@@ -80,7 +99,7 @@ wxRendererNative& wxRendererNative::GetDefault()
     return s_rendererMac;
 }
 
     return s_rendererMac;
 }
 

-void wxRendererMac::DrawHeaderButton( wxWindow *win,
+int wxRendererMac::DrawHeaderButton( wxWindow *win,

     wxDC& dc,
     const wxRect& rect,
     int flags,
     wxDC& dc,
     const wxRect& rect,
     int flags,


@@ -151,7 +170,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
             // The down arrow is drawn automatically, change it to an up arrow if needed.
             if ( sortArrow == wxHDR_SORT_ICON_UP )
                 drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;
             // The down arrow is drawn automatically, change it to an up arrow if needed.
             if ( sortArrow == wxHDR_SORT_ICON_UP )
                 drawInfo.adornment = kThemeAdornmentHeaderButtonSortUp;

-                
+

             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             // If we don't want any arrows we need to draw over the one already there
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             // If we don't want any arrows we need to draw over the one already there


@@ -164,7 +183,7 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
                 headerRect.size.width += 25;
                 HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
                 CGContextRestoreGState( cgContext );
                 headerRect.size.width += 25;
                 HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
                 CGContextRestoreGState( cgContext );

-            }                
+            }

         }
 
 #if wxMAC_USE_CORE_GRAPHICS
         }
 
 #if wxMAC_USE_CORE_GRAPHICS


@@ -183,14 +202,14 @@ void wxRendererMac::DrawHeaderButton( wxWindow *win,
     }
     flags &= ~wxCONTROL_SELECTED;
 
     }
     flags &= ~wxCONTROL_SELECTED;
 

-    DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);
+    return DrawHeaderButtonContents(win, dc, newRect, flags, sortArrow, params);

 }
 
 
 int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win))
 {
 }
 
 
 int wxRendererMac::GetHeaderButtonHeight(wxWindow* WXUNUSED(win))
 {

-    SInt32             standardHeight;
-    OSStatus           errStatus;
+    SInt32      standardHeight;
+    OSStatus        errStatus;

 
     errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight );
     if (errStatus == noErr)
 
     errStatus = GetThemeMetric( kThemeMetricListHeaderHeight, &standardHeight );
     if (errStatus == noErr)


@@ -216,7 +235,7 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
     const wxCoord y = rect.y;
     const wxCoord w = rect.width;
     const wxCoord h = rect.height;
     const wxCoord y = rect.y;
     const wxCoord w = rect.width;
     const wxCoord h = rect.height;

-#endif    
+#endif

 
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 
 
     dc.SetBrush( *wxTRANSPARENT_BRUSH );
 


@@ -266,10 +285,10 @@ void wxRendererMac::DrawTreeItemButton( wxWindow *win,
             // Apple mailing list posts say to use the arrow adornment constants, but those don't work.
             // We need to set the value using the 'old' DrawThemeButton constants instead.
             drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight;
             // Apple mailing list posts say to use the arrow adornment constants, but those don't work.
             // We need to set the value using the 'old' DrawThemeButton constants instead.
             drawInfo.value = (flags & wxCONTROL_EXPANDED) ? kThemeDisclosureDown : kThemeDisclosureRight;

-            drawInfo.adornment = kThemeAdornmentNone; 
+            drawInfo.adornment = kThemeAdornmentNone;

 
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
 
             HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );

-            
+

         }
 
 #if wxMAC_USE_CORE_GRAPHICS
         }
 
 #if wxMAC_USE_CORE_GRAPHICS


@@ -353,18 +372,181 @@ wxRendererMac::DrawItemSelectionRect(wxWindow *win,
                                      const wxRect& rect,
                                      int flags )
 {
                                      const wxRect& rect,
                                      int flags )
 {

-    RGBColor selColor; 
-    if (flags & wxCONTROL_SELECTED)
-    {
-        if (flags & wxCONTROL_FOCUSED)
-            GetThemeBrushAsColor(kThemeBrushAlternatePrimaryHighlightColor, 32, true, &selColor);
-        else
-            GetThemeBrushAsColor(kThemeBrushSecondaryHighlightColor, 32, true, &selColor);
-    }
-    
-    wxBrush selBrush = wxBrush( wxColour( selColor.red, selColor.green, selColor.blue ), wxSOLID );
+    if ( !(flags & wxCONTROL_SELECTED) )
+        return;
+
+    RGBColor selColor;
+    GetThemeBrushAsColor(flags & wxCONTROL_FOCUSED
+                            ? kThemeBrushAlternatePrimaryHighlightColor
+                            : kThemeBrushSecondaryHighlightColor,
+                         32, true, &selColor);
+
+    wxBrush selBrush(selColor);

 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( selBrush );
     dc.DrawRectangle( rect );
 }
 
     dc.SetPen( *wxTRANSPARENT_PEN );
     dc.SetBrush( selBrush );
     dc.DrawRectangle( rect );
 }

+
+
+void
+wxRendererMac::DrawMacThemeButton(wxWindow *win,
+                                  wxDC& dc,
+                                  const wxRect& rect,
+                                  int flags,
+                                  int kind,
+                                  int adornment)
+{
+#if !wxMAC_USE_CORE_GRAPHICS
+    const wxCoord x = dc.LogicalToDeviceX(rect.x);
+    const wxCoord y = dc.LogicalToDeviceY(rect.y);
+    const wxCoord w = dc.LogicalToDeviceXRel(rect.width);
+    const wxCoord h = dc.LogicalToDeviceYRel(rect.height);
+#else
+    // now the wxGCDC is using native transformations
+    const wxCoord x = rect.x;
+    const wxCoord y = rect.y;
+    const wxCoord w = rect.width;
+    const wxCoord h = rect.height;
+#endif
+
+    dc.SetBrush( *wxTRANSPARENT_BRUSH );
+
+    HIRect headerRect = CGRectMake( x, y, w, h );
+    if ( !dc.IsKindOf( CLASSINFO( wxPaintDC ) ) )
+    {
+        Rect r =
+        {
+            (short) headerRect.origin.y, (short) headerRect.origin.x,
+            (short) (headerRect.origin.y + headerRect.size.height),
+            (short) (headerRect.origin.x + headerRect.size.width)
+        };
+
+        RgnHandle updateRgn = NewRgn();
+        RectRgn( updateRgn, &r );
+        HIViewSetNeedsDisplayInRegion( (HIViewRef) win->GetHandle(), updateRgn, true );
+        DisposeRgn( updateRgn );
+    }
+    else
+    {
+        CGContextRef cgContext;
+
+#if wxMAC_USE_CORE_GRAPHICS
+        cgContext = (CGContextRef) dc.GetGraphicsContext()->GetNativeContext();
+#else
+        Rect bounds;
+
+        GetPortBounds( (CGrafPtr) dc.m_macPort, &bounds );
+        QDBeginCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+
+        CGContextTranslateCTM( cgContext, 0, bounds.bottom - bounds.top );
+        CGContextScaleCTM( cgContext, 1, -1 );
+
+        HIShapeReplacePathInCGContext( HIShapeCreateWithQDRgn( (RgnHandle) dc.m_macCurrentClipRgn ), cgContext );
+        CGContextClip( cgContext );
+        HIViewConvertRect( &headerRect, (HIViewRef) win->GetHandle(), (HIViewRef) win->MacGetTopLevelWindow()->GetHandle() );
+#endif
+
+        {
+            HIThemeButtonDrawInfo drawInfo;
+            HIRect labelRect;
+
+            memset( &drawInfo, 0, sizeof(drawInfo) );
+            drawInfo.version = 0;
+            drawInfo.kind = kind;
+            drawInfo.state = (flags & wxCONTROL_DISABLED) ? kThemeStateInactive : kThemeStateActive;
+            drawInfo.value = (flags & wxCONTROL_SELECTED) ? kThemeButtonOn : kThemeButtonOff;
+            drawInfo.adornment = adornment;
+
+            HIThemeDrawButton( &headerRect, &drawInfo, cgContext, kHIThemeOrientationNormal, &labelRect );
+        }
+
+#if wxMAC_USE_CORE_GRAPHICS
+#else
+        QDEndCGContext( (CGrafPtr) dc.m_macPort, &cgContext );
+#endif
+    }
+}
+
+
+void
+wxRendererMac::DrawComboBoxDropButton(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags)
+{
+    int kind;
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeArrowButtonSmall;
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeArrowButtonMini;
+    else
+        kind = kThemeArrowButton;
+
+    DrawMacThemeButton(win, dc, rect, flags,
+                       kind, kThemeAdornmentArrowDownArrow);
+}
+
+void
+wxRendererMac::DrawPushButton(wxWindow *win,
+                              wxDC& dc,
+                              const wxRect& rect,
+                              int flags)
+{
+    int kind;
+    if (win->GetWindowVariant() == wxWINDOW_VARIANT_SMALL || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_SMALL))
+        kind = kThemeBevelButtonSmall;
+    // There is no kThemeBevelButtonMini, but in this case, use Small
+    else if (win->GetWindowVariant() == wxWINDOW_VARIANT_MINI || (win->GetParent() && win->GetParent()->GetWindowVariant() == wxWINDOW_VARIANT_MINI))
+        kind = kThemeBevelButtonSmall;
+    else
+        kind = kThemeBevelButton;
+
+    DrawMacThemeButton(win, dc, rect, flags,
+                       kind, kThemeAdornmentNone);
+}
+
+void
+wxRendererMac::DrawFocusRect(wxWindow* win, wxDC& dc, const wxRect& rect, int flags)
+{
+    if (!win)
+    {
+        wxDelegateRendererNative::DrawFocusRect(win, dc, rect, flags);
+        return;
+    }
+
+#if wxMAC_USE_CORE_GRAPHICS
+    {
+        CGRect cgrect = CGRectMake( rect.x , rect.y , rect.width, rect.height ) ;
+
+        HIThemeFrameDrawInfo info ;
+        memset( &info, 0 , sizeof(info) ) ;
+
+        info.version = 0 ;
+        info.kind = 0 ;
+        info.state = kThemeStateActive;
+        info.isFocused = true ;
+
+        CGContextRef cgContext = (CGContextRef) win->MacGetCGContextRef() ;
+        wxASSERT( cgContext ) ;
+
+        HIThemeDrawFocusRect( &cgrect , true , cgContext , kHIThemeOrientationNormal ) ;
+    }
+#else
+    // FIXME: not yet working for !wxMAC_USE_CORE_GRAPHICS
+    {
+        Rect r;
+        r.left = rect.x; r.top = rect.y; r.right = rect.GetRight(); r.bottom = rect.GetBottom();
+        wxTopLevelWindowMac* top = win->MacGetTopLevelWindow();
+        if ( top )
+        {
+            wxPoint pt(0, 0) ;
+            wxMacControl::Convert( &pt , win->GetPeer() , top->GetPeer() ) ;
+            OffsetRect( &r , pt.x , pt.y ) ;
+        }
+
+        DrawThemeFocusRect( &r , true ) ;
+    }
+#endif
+}
+