diff --git a/checkin_notes b/checkin_notes index f67ae9c688..85f226a8b9 100644 --- a/checkin_notes +++ b/checkin_notes @@ -8581,8 +8581,10 @@ Charlie 20 Nov 2011 Charlie 21 Nov 2011 - MGR: In Simple View, draw Mac progress bar on white background for - better visibility. + better visibility; adjust red New Notices ring for new button + shapes if on Mac OS 10.7. clientgui/ + sg_BoincSimpleFrame.cpp,.h sg_PanelBase.cpp sg_TaskPanel.cpp diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp index 1bce1d0fba..a8f32535b4 100755 --- a/clientgui/sg_BoincSimpleFrame.cpp +++ b/clientgui/sg_BoincSimpleFrame.cpp @@ -768,6 +768,14 @@ CSimpleGUIPanel::CSimpleGUIPanel(wxWindow* parent) : #ifdef __WXMAC__ // Tell accessibility aids to ignore this panel (but not its contents) HIObjectSetAccessibilityIgnored((HIObjectRef)GetHandle(), true); + + SInt32 response; + OSStatus err = Gestalt(gestaltSystemVersion, &response); + if ((err == noErr) && (response >= 0x1070)) { + m_iRedRingRadius = 4; + } else { + m_iRedRingRadius = 12; + } #endif m_SuspendResumeButton->Disable(); @@ -1011,7 +1019,6 @@ void CSimpleGUIPanel::OnPaint(wxPaintEvent& WXUNUSED(event)) { if (m_bNewNoticeAlert) { wxRect r = m_NoticesButton->GetRect(); - r.Inflate(3, 3); if (m_bNoticesButtonIsRed) { wxPen oldPen = myDC.GetPen(); wxBrush oldBrush = myDC.GetBrush(); @@ -1021,10 +1028,13 @@ void CSimpleGUIPanel::OnPaint(wxPaintEvent& WXUNUSED(event)) { myDC.SetPen(bgPen); myDC.SetBrush(*wxTRANSPARENT_BRUSH); #ifdef __WXMAC__ - myDC.DrawRoundedRectangle(r.x, r.y, r.width, r.height, 12); + r.Inflate(2, 2); + myDC.DrawRoundedRectangle(r.x, r.y, r.width, r.height+1, m_iRedRingRadius); #elif defined(__WXMSW__) + r.Inflate(3, 3); myDC.DrawRectangle(r.x, r.y, r.width, r.height); #else + r.Inflate(3, 3); myDC.DrawRoundedRectangle(r.x, r.y, r.width, r.height, 6); #endif // Restore Mode, Pen and Brush diff --git a/clientgui/sg_BoincSimpleFrame.h b/clientgui/sg_BoincSimpleFrame.h index 59596acf78..b0d329d4b7 100644 --- a/clientgui/sg_BoincSimpleFrame.h +++ b/clientgui/sg_BoincSimpleFrame.h @@ -76,6 +76,7 @@ protected: // EventHandlerRef m_pSGAccessibilityEventHandlerRef; + int m_iRedRingRadius; #endif wxBitmap m_bmpBg; wxButton *m_NoticesButton; @@ -87,7 +88,7 @@ protected: bool m_bIsSuspended; private: - int m_irefreshCount; + int m_irefreshCount; bool dlgOpen; wxTimer* checkForNewNoticesTimer; wxString m_sSuspendButtonToolTip;