ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4152 from aldelaro5/debugger-font-fix 

Fix the Debugger font not appearing on the captions of panes
This commit is contained in:
Scott Mansell 2016-08-29 11:17:59 +12:00 committed by GitHub
parent 916bfdedbf cd515911c0
commit fc969388f0
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/DolphinWX/Debugger/CodeWindow.cpp
View File

@ -19,6 +19,7 @@
#include <wx/textdlg.h> #include <wx/textdlg.h>
#include <wx/thread.h> #include <wx/thread.h>
#include <wx/toolbar.h> #include <wx/toolbar.h>
#include <wx/aui/dockart.h>
// clang-format on // clang-format on
#include "Common/BreakPoints.h" #include "Common/BreakPoints.h"
@ -779,4 +780,5 @@ void CCodeWindow::UpdateButtonStates()
symbols->SetFont(DebuggerFont); symbols->SetFont(DebuggerFont);
callers->SetFont(DebuggerFont); callers->SetFont(DebuggerFont);
calls->SetFont(DebuggerFont); calls->SetFont(DebuggerFont);
m_aui_manager.GetArtProvider()->SetFont(wxAUI_DOCKART_CAPTION_FONT, DebuggerFont);
} }

3
Source/Core/DolphinWX/FrameAui.cpp
View File

@ -21,6 +21,7 @@
#include <wx/statusbr.h> #include <wx/statusbr.h>
#include <wx/textdlg.h> #include <wx/textdlg.h>
#include <wx/toplevel.h> #include <wx/toplevel.h>
#include <wx/aui/dockart.h>
// clang-format on // clang-format on
#include "Common/CommonTypes.h" #include "Common/CommonTypes.h"
@ -36,6 +37,7 @@
#include "DolphinWX/LogConfigWindow.h" #include "DolphinWX/LogConfigWindow.h"
#include "DolphinWX/LogWindow.h" #include "DolphinWX/LogWindow.h"
#include "DolphinWX/WxUtils.h" #include "DolphinWX/WxUtils.h"
#include "DolphinWX/Debugger/DebuggerUIUtil.h"
// ------------ // ------------
// Aui events // Aui events
@ -622,6 +624,7 @@ void CFrame::TogglePaneStyle(bool On, int EventId)
Pane.Dockable(!m_bNoDocking); Pane.Dockable(!m_bNoDocking);
} }
} }
m_Mgr->GetArtProvider()->SetFont(wxAUI_DOCKART_CAPTION_FONT, DebuggerFont);
m_Mgr->Update(); m_Mgr->Update();
} }