Enable dark mode for MacOS

common/advanced_config.cpp

@@ -159,8 +159,6 @@ static const wxChar HotkeysDumper[] = wxT( "HotkeysDumper" );
 
 static const wxChar DrawBoundingBoxes[] = wxT( "DrawBoundingBoxes" );
 
-static const wxChar AllowDarkMode[] = wxT( "AllowDarkMode" );
-
 static const wxChar ShowPcbnewExportNetlist[] = wxT( "ShowPcbnewExportNetlist" );
 
 } // namespace KEYS
@@ -264,7 +262,6 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_SmallDrillMarkSize        = 0.35;
     m_HotkeysDumper             = false;
     m_DrawBoundingBoxes         = false;
-    m_AllowDarkMode             = false;
     m_ShowPcbnewExportNetlist   = false;
 
     loadFromConfigFile();
@@ -359,15 +356,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::DrawBoundingBoxes,
                                                 &m_DrawBoundingBoxes, false ) );
 
-#if defined( __WXGTK__ ) || defined( __WXMSW__ )
-    bool defaultDarkMode = true;
-#else
-    bool defaultDarkMode = false;
-#endif
-
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::AllowDarkMode,
-                                                &m_AllowDarkMode, defaultDarkMode ) );
-
     configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ShowPcbnewExportNetlist,
                                                 &m_ShowPcbnewExportNetlist, false ) );
 

common/bitmap_store.cpp

@@ -170,7 +170,7 @@ bool BITMAP_STORE::ThemeChanged()
 
     wxString oldTheme = m_theme;
 
-    if( ADVANCED_CFG::GetCfg().m_AllowDarkMode && settings )
+    if( settings )
     {
         switch( settings->m_Appearance.icon_theme )
         {

common/dialogs/panel_common_settings.cpp

@@ -72,14 +72,6 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP
     m_antialiasingFallbackLabel->Show( false );
 #endif
 
-    if( !ADVANCED_CFG::GetCfg().m_AllowDarkMode )
-    {
-        m_rbIconThemeLight->Hide();
-        m_rbIconThemeDark->Hide();
-        m_rbIconThemeAuto->Hide();
-        m_stIconTheme->Hide();
-    }
-
     m_textEditorBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
     m_pdfViewerBtn->SetBitmap( KiBitmap( BITMAPS::small_folder ) );
 

common/tool/action_toolbar.cpp

@@ -181,11 +181,8 @@ ACTION_TOOLBAR::ACTION_TOOLBAR( EDA_BASE_FRAME* parent, wxWindowID id, const wxP
 
 #if !wxCHECK_VERSION( 3, 1, 0 )
     // Custom art provider makes dark mode work on wx < 3.1
-    if( ADVANCED_CFG::GetCfg().m_AllowDarkMode )
+    WX_AUI_TOOLBAR_ART* newArt = new WX_AUI_TOOLBAR_ART();
-    {
+    SetArtProvider( newArt );
-        WX_AUI_TOOLBAR_ART* newArt = new WX_AUI_TOOLBAR_ART();
-        SetArtProvider( newArt );
-    }
 #endif
 
     Connect( wxEVT_COMMAND_TOOL_CLICKED, wxAuiToolBarEventHandler( ACTION_TOOLBAR::onToolEvent ),

common/widgets/infobar.cpp

@@ -19,6 +19,7 @@
  */
 
 #include <id.h>
+#include <kiplatform/ui.h>
 #include <widgets/infobar.h>
 #include "wx/artprov.h"
 #include <wx/aui/framemanager.h>
@@ -54,7 +55,10 @@ WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager* aMgr, wxWindowID aWinid
 
 #ifdef __WXMAC__
     // wxWidgets hard-codes wxSYS_COLOUR_INFOBK to { 0xFF, 0xFF, 0xD3 } on Mac.
-    SetBackgroundColour( wxColour( 255, 249, 189 ) );
+    if( KIPLATFORM::UI::IsDarkTheme() )
+        SetBackgroundColour( wxColour( 28, 27, 20 ) );
+    else
+        SetBackgroundColour( wxColour( 255, 249, 189 ) );
 #endif
 
     SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP );

include/advanced_config.h

@@ -165,11 +165,6 @@ public:
      */
     bool m_DrawBoundingBoxes;
 
-    /**
-     * Enable detection of dark mode and automatic switch to dark-mode icon theme
-     */
-    bool m_AllowDarkMode;
-
     /**
      * Enable exporting board editor netlist to a file for troubleshooting purposes.
      */

resources/macos/plist/bitmap2component.Info.plist.in

@@ -17,7 +17,6 @@
     <key>CFBundleVersion</key>                <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>          <true/>
     <key>LSRequiresCarbon</key>               <true/>
-    <key>NSRequiresAquaSystemAppearance</key> <true/>
     <key>NSHumanReadableCopyright</key>       <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>        <string>True</string>
 </dict>

resources/macos/plist/eeschema.Info.plist.in

@@ -30,7 +30,6 @@
     <key>CFBundleVersion</key>                      <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>                <true/>
     <key>LSRequiresCarbon</key>                     <true/>
-    <key>NSRequiresAquaSystemAppearance</key>       <true/>
     <key>NSHumanReadableCopyright</key>             <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>              <string>True</string>
 </dict>

resources/macos/plist/gerbview.Info.plist.in

@@ -49,7 +49,6 @@
     <key>CFBundleVersion</key>                      <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>                <true/>
     <key>LSRequiresCarbon</key>                     <true/>
-    <key>NSRequiresAquaSystemAppearance</key>       <true/>
     <key>NSHumanReadableCopyright</key>             <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>              <string>True</string>
 </dict>

resources/macos/plist/kicad.Info.plist.in

@@ -29,7 +29,6 @@
     <key>CFBundleVersion</key>                      <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>                <true/>
     <key>LSRequiresCarbon</key>                     <true/>
-    <key>NSRequiresAquaSystemAppearance</key>       <true/>
     <key>NSHumanReadableCopyright</key>             <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>              <string>True</string>
 </dict>

resources/macos/plist/pcb_calculator.Info.plist.in

@@ -16,7 +16,6 @@
     <key>CFBundleVersion</key>                 <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>           <true/>
     <key>LSRequiresCarbon</key>                <true/>
-    <key>NSRequiresAquaSystemAppearance</key>  <true/>
     <key>NSHumanReadableCopyright</key>        <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>         <string>True</string>
 </dict>

resources/macos/plist/pcbnew.Info.plist.in

@@ -31,7 +31,6 @@
     <key>CFBundleVersion</key>                  <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>            <true/>
     <key>LSRequiresCarbon</key>                 <true/>
-    <key>NSRequiresAquaSystemAppearance</key>   <true/>
     <key>NSHumanReadableCopyright</key>         <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>          <string>True</string>
 </dict>

resources/macos/plist/pleditor.Info.plist.in

@@ -29,7 +29,6 @@
     <key>CFBundleVersion</key>                      <string>@KICAD_VERSION_FULL@</string>
     <key>CSResourcesFileMapped</key>                <true/>
     <key>LSRequiresCarbon</key>                     <true/>
-    <key>NSRequiresAquaSystemAppearance</key>       <true/>
     <key>NSHumanReadableCopyright</key>             <string>Copyright The KiCad Developers</string>
     <key>NSHighResolutionCapable</key>              <string>True</string>
 </dict>