From 0525ebd241981715c64017f4c3ce10e9852f5a0f Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Thu, 10 May 2007 09:10:51 +0000
Subject: [PATCH] A better fix for Mac PieCtrl legend clipping bug

svn path=/trunk/boinc/; revision=12633
---
 checkin_notes                  | 17 +++++++++++++++++
 clientgui/common/wxPieCtrl.cpp | 35 ++++++++++++++++++++++++----------
 clientgui/common/wxPieCtrl.h   |  1 +
 3 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 9c783701f5..ca4982c0c9 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4666,3 +4666,20 @@ Rytis   9 May 2007
             bbcode.php
         inc/
             text_transform.inc
+
+Charlie 10 May 2007
+    - A better fix for Mac PieCtrl legend clipping bug: wxPieCtrl::Refresh() 
+        calls new wxPieCtrlLegend::MeasureText() method to caclulate size of 
+        the legend area and SetSize() of legend window before OnPaint() is 
+        called.  Apparently, calling SetSize() from within the OnPaint() 
+        function doesn't adjust the "invalid" area to be repainted until 
+        a return to the event loop, so the added area didn't get painted 
+        until the next OnPaint() call.  Also, the wxMemoryDC bitmap was 
+        being created at the smaller size, so that was also clipping the 
+        drawing.
+
+    clientgui/
+        common/
+            wxPieCtrl.cpp
+        
+        
diff --git a/clientgui/common/wxPieCtrl.cpp b/clientgui/common/wxPieCtrl.cpp
index cb7c49435f..de687b9927 100644
--- a/clientgui/common/wxPieCtrl.cpp
+++ b/clientgui/common/wxPieCtrl.cpp
@@ -95,24 +95,23 @@ void wxPieCtrlLegend::SetBackColour(wxColour colour)
 	Refresh();
 }
 
-void wxPieCtrlLegend::OnPaint(wxPaintEvent & /*event*/)
+void wxPieCtrlLegend::MeasureText()
 {
-	int w,h;
 	unsigned int i;
+	int w,h;
+	int dy(m_VerBorder),maxwidth,tw,th,titlew,titleh;
 	wxPieCtrl * parent = (wxPieCtrl *)GetParent();
 
 	if (parent->m_Series.Count() == 0)
 		return;
 
-	// First determine the desired size of the legend box
 	wxBitmap testbmp(10, 10);
 	wxMemoryDC testmdc(testbmp);
-	int dy(m_VerBorder),tw,th,titlew,titleh;
  	testmdc.SetFont(m_TitleFont);
 	testmdc.GetTextExtent(m_szTitle,&titlew,&titleh);
 	dy += (titleh+5);
 	testmdc.SetFont(m_LabelFont);
-	int maxwidth(titlew + 2*m_HorBorder + 15);
+	maxwidth = titlew + 2*m_HorBorder + 15;
 	for(i = 0; i < parent->m_Series.Count(); i++)
 	{
 		testmdc.GetTextExtent(parent->m_Series[i].GetLabel(), &tw, &th);
@@ -120,16 +119,30 @@ void wxPieCtrlLegend::OnPaint(wxPaintEvent & /*event*/)
 		maxwidth = max(maxwidth, (int)(2*m_HorBorder+tw+15));
 	}
 	dy += m_VerBorder;
-        w = maxwidth;
-        h = dy;
 
-	// Now create the legend box
+	GetSize(&w, &h);
+	if(w != maxwidth || h != dy)
+		SetSize(maxwidth, dy);
+}
+
+void wxPieCtrlLegend::OnPaint(wxPaintEvent & /*event*/)
+{
+	int w,h,dy;
+	unsigned int i;
+	int tw,th,titlew,titleh;
+
+	wxPieCtrl * parent = (wxPieCtrl *)GetParent();
+
+	if (parent->m_Series.Count() == 0)
+		return;
+
+	GetSize(&w, &h);
 	wxBitmap bmp(w, h);
 	wxMemoryDC mdc(bmp);
 
 	if(IsTransparent())
 	{
-		wxClientDC parentdc(GetParent());
+//		wxClientDC parentdc(GetParent());
 		mdc.Blit(0,0,w,h,&m_BackgroundDC, 0, 0);
 	}
 	else
@@ -141,6 +154,7 @@ void wxPieCtrlLegend::OnPaint(wxPaintEvent & /*event*/)
 	// Draw legend title
 	mdc.SetFont(m_TitleFont);
 	mdc.SetTextForeground(m_TitleColour);
+	mdc.GetTextExtent(m_szTitle,&titlew,&titleh);
 	mdc.DrawText(m_szTitle,m_HorBorder+2,m_VerBorder+2);
 
 	// Draw legend items
@@ -324,7 +338,7 @@ void wxPieCtrl::RecreateCanvas()
 //#endif
  	m_CanvasBitmap.Create(x, y);
    	m_CanvasDC.SelectObject(m_CanvasBitmap);
-	m_Legend->SetSize(x, y);
+
 }
 
 void wxPieCtrl::GetPartAngles(wxArrayDouble & angles)
@@ -447,5 +461,6 @@ void wxPieCtrl::Refresh(bool eraseBackground, const wxRect* rect)
 {
 	m_CanRepaint = true;
 	wxWindow::Refresh(eraseBackground, rect);
+	m_Legend->MeasureText();   
 }
 
diff --git a/clientgui/common/wxPieCtrl.h b/clientgui/common/wxPieCtrl.h
index 48a71c5db0..2486b16c8b 100644
--- a/clientgui/common/wxPieCtrl.h
+++ b/clientgui/common/wxPieCtrl.h
@@ -84,6 +84,7 @@ class wxPieCtrlLegend : public wxWindow
 	wxString m_szTitle;
 
 protected:
+        void MeasureText();
 	void RecreateBackground(wxMemoryDC & parentdc);
 public:
 	/// Constructor