Merge pull request #4180 from BOINC/mac_fix_high_CPU_SimpleView

Mac: Fix high CPU use by Simple View when run on MacOS 10.14 and later
BOINC · Feb 12, 2021 · 9becb35 · 9becb35
2 parents f41459a + 1bb24be
commit 9becb35
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/clientgui/mac/MacBitmapComboBox.cpp b/clientgui/mac/MacBitmapComboBox.cpp
@@ -17,6 +17,7 @@
 
 #include "stdwx.h"
 #include "MacBitmapComboBox.h"
+#include "mac_util.h"
 
 #define POPUPBUTTONCONTROLHEIGHT 40
 
@@ -275,7 +276,7 @@ void CBOINCBitmapComboBox::OnPaint(wxPaintEvent& event) {
     wxBrush oldBrush = myDC.GetBrush();
     int oldMode = myDC.GetBackgroundMode();
 
-    myDC.SetPen(*wxMEDIUM_GREY_PEN);
+    myDC.SetPen(*wxLIGHT_GREY_PEN);
     myDC.SetBrush(*wxWHITE_BRUSH);
     myDC.SetBackgroundMode(wxSOLID);
 
@@ -287,8 +288,10 @@ void CBOINCBitmapComboBox::OnPaint(wxPaintEvent& event) {
     myDC.SetPen(oldPen);
     myDC.SetBrush(oldBrush);
 
-    CDrawLargeBitmapEvent newEvent(wxEVT_DRAW_LARGEBITMAP, this);
-    AddPendingEvent(newEvent);
+    if (compareOSVersionTo(10, 14) < 0) {
+        CDrawLargeBitmapEvent newEvent(wxEVT_DRAW_LARGEBITMAP, this);
+        AddPendingEvent(newEvent);
+    }
 }