Merge pull request #4290 from EmptyChaos/varwidth-fonts

WxDebugger: Fix variable width fonts in Code/Memory views

1 files changed, 4 insertions, 11 deletions

diff --git a/Source/Core/DolphinWX/Debugger/MemoryView.cpp b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
index 47c2969dc2..67a38aa0b5 100644
--- a/Source/Core/DolphinWX/Debugger/MemoryView.cpp
+++ b/Source/Core/DolphinWX/Debugger/MemoryView.cpp
@@ -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;