From c1a724377f96c9d27a62b2e3ed6baaac8a6ac68f Mon Sep 17 00:00:00 2001 From: Jon Evans Date: Sat, 10 Oct 2020 14:55:19 -0400 Subject: [PATCH] Fix AUI pane caption colors for dark mode --- gerbview/gerbview_frame.cpp | 5 +++++ pcbnew/footprint_edit_frame.cpp | 5 +++++ pcbnew/pcb_edit_frame.cpp | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/gerbview/gerbview_frame.cpp b/gerbview/gerbview_frame.cpp index 7217bbcfcc..5c8c0f6824 100644 --- a/gerbview/gerbview_frame.cpp +++ b/gerbview/gerbview_frame.cpp @@ -144,6 +144,11 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent ) m_auimgr.AddPane( GetCanvas(), EDA_PANE().Canvas().Name( "DrawFrame" ).Center() ); + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + ReFillLayerWidget(); // this is near end because contents establish size m_auimgr.Update(); diff --git a/pcbnew/footprint_edit_frame.cpp b/pcbnew/footprint_edit_frame.cpp index 66f7f8a265..e1aba23008 100644 --- a/pcbnew/footprint_edit_frame.cpp +++ b/pcbnew/footprint_edit_frame.cpp @@ -233,6 +233,11 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent, ActivateGalCanvas(); + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + // Call Update() to fix all pane default sizes, especially the "InfoBar" pane before // hidding it. m_auimgr.Update(); diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index ad342aa7d7..a73aeb7bae 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -264,6 +264,11 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : // The selection filter doesn't need to grow in the vertical direction when docked m_auimgr.GetPane( "SelectionFilter" ).dock_proportion = 0; + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_ACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + m_auimgr.GetArtProvider()->SetColour( wxAUI_DOCKART_INACTIVE_CAPTION_TEXT_COLOUR, + wxSystemSettings::GetColour( wxSYS_COLOUR_BTNTEXT ) ); + // Call Update() to fix all pane default sizes, especially the "InfoBar" pane before // hidding it. m_auimgr.Update();