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 #4290 from EmptyChaos/varwidth-fonts 

WxDebugger: Fix variable width fonts in Code/Memory views
This commit is contained in:
shuffle2 2016-10-04 01:39:27 -07:00 committed by GitHub
parent 7b29b3c571 116348a877
commit 037f0a1803
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/DolphinWX/Debugger/CodeView.cpp
View File

@ -390,8 +390,9 @@ void CCodeView::OnPaint(wxPaintEvent& event)
{
wxFontMetrics metrics = paint_dc.GetFontMetrics();
char_width = metrics.averageWidth;
if (metrics.height > m_rowHeight)
m_rowHeight = metrics.height;
m_rowHeight = std::max(metrics.height, m_rowHeight);
if (!DebuggerFont.IsFixedWidth())
char_width = paint_dc.GetTextExtent("mxx").GetWidth() / 3; // (1em + 2ex) / 3
}
std::unique_ptr<wxGraphicsContext> ctx(wxGraphicsContext::Create(paint_dc));
@ -545,7 +546,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
// UnDecorateSymbolName(desc,temp,255,UNDNAME_COMPLETE);
if (!desc.empty())
{
ctx->DrawText(StrToWxStr(desc), text_col + 45 * char_width, row_y);
ctx->DrawText(StrToWxStr(desc), text_col + 44 * char_width, row_y);
}
}
@ -569,7 +570,7 @@ void CCodeView::OnPaint(wxPaintEvent& event)
for (int i = 0; i < num_branches; ++i)
{
int x = text_col + 52 * char_width + (branches[i].srcAddr % 9) * 8;
int x = text_col + 60 * char_width + (branches[i].srcAddr % 9) * 8;
branch_path.MoveToPoint(x - 2 * scale, branches[i].src);
if (branches[i].dst < rc.height + 400 && branches[i].dst > -400)

15
Source/Core/DolphinWX/Debugger/MemoryView.cpp
View File

@ -269,22 +269,15 @@ void CMemoryView::OnPaint(wxPaintEvent& event)
wxPaintDC dc(this);
wxRect rc = GetClientRect();
if (DebuggerFont.IsFixedWidth())
{
dc.SetFont(DebuggerFont);
}
else
{
dc.SetFont(wxFont(DebuggerFont.GetPointSize(), wxFONTFAMILY_TELETYPE, wxFONTSTYLE_NORMAL,
wxFONTWEIGHT_NORMAL, false, "Courier"));
}
dc.SetFont(DebuggerFont);
int font_width;
{
wxFontMetrics metrics = dc.GetFontMetrics();
font_width = metrics.averageWidth;
if (metrics.height > rowHeight)
rowHeight = metrics.height;
rowHeight = std::max(rowHeight, metrics.height);
if (!DebuggerFont.IsFixedWidth())
font_width = dc.GetTextExtent("mxx").GetWidth() / 3; // (1em + 2ex) / 3
}
const int row_start_x = m_left_col_width + 1;