From cd515911c0bb91a7ff11cfaf37c5629fe79bc1bf Mon Sep 17 00:00:00 2001 From: aldelaro5 Date: Sat, 27 Aug 2016 12:12:13 -0400 Subject: [PATCH] Fix the user font not appearing on the captions of panes Both those in the code window and the ones that appears when the user select edit perpective. The one that isn't fixed by this is in edit perspective mode, when the user drags a panel out and it becomes a floating window. --- Source/Core/DolphinWX/Debugger/CodeWindow.cpp | 2 ++ Source/Core/DolphinWX/FrameAui.cpp | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp index 66e87cf9dc..beda6a442b 100644 --- a/Source/Core/DolphinWX/Debugger/CodeWindow.cpp +++ b/Source/Core/DolphinWX/Debugger/CodeWindow.cpp @@ -19,6 +19,7 @@ #include #include #include +#include // clang-format on #include "Common/BreakPoints.h" @@ -779,4 +780,5 @@ void CCodeWindow::UpdateButtonStates() symbols->SetFont(DebuggerFont); callers->SetFont(DebuggerFont); calls->SetFont(DebuggerFont); + m_aui_manager.GetArtProvider()->SetFont(wxAUI_DOCKART_CAPTION_FONT, DebuggerFont); } diff --git a/Source/Core/DolphinWX/FrameAui.cpp b/Source/Core/DolphinWX/FrameAui.cpp index 65297eb471..238fce6c4b 100644 --- a/Source/Core/DolphinWX/FrameAui.cpp +++ b/Source/Core/DolphinWX/FrameAui.cpp @@ -21,6 +21,7 @@ #include #include #include +#include // clang-format on #include "Common/CommonTypes.h" @@ -36,6 +37,7 @@ #include "DolphinWX/LogConfigWindow.h" #include "DolphinWX/LogWindow.h" #include "DolphinWX/WxUtils.h" +#include "DolphinWX/Debugger/DebuggerUIUtil.h" // ------------ // Aui events @@ -622,6 +624,7 @@ void CFrame::TogglePaneStyle(bool On, int EventId) Pane.Dockable(!m_bNoDocking); } } + m_Mgr->GetArtProvider()->SetFont(wxAUI_DOCKART_CAPTION_FONT, DebuggerFont); m_Mgr->Update(); }