Merge pull request #22 from fiendish/fixedfontfix

fixedwidth font fixes for timer and multiline trigger dlgs
nickgammon · Mar 21, 2016 · 8c0f2ef · 8c0f2ef
2 parents 7da5fd3 + 8661d66
commit 8c0f2ef
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/dialogs/MultiLineTriggerDlg.cpp b/dialogs/MultiLineTriggerDlg.cpp
@@ -86,7 +86,7 @@ void CMultiLineTriggerDlg::DoDataExchange(CDataExchange* pDX)
 
      }    // end of save and validate
    else
-     FixFont (m_font, m_ctlTriggerText, "Courier New", 9, FW_NORMAL, DEFAULT_CHARSET);
+     FixFont (m_font, m_ctlTriggerText, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
 
 }
 

diff --git a/dialogs/world_prefs/TimerDlg.cpp b/dialogs/world_prefs/TimerDlg.cpp
@@ -50,6 +50,7 @@ CTimerDlg::CTimerDlg(CWnd* pParent /*=NULL*/)
 
   m_current_timer = NULL;
   m_pTimerMap = NULL;
+  m_font = NULL;
   m_pDoc = NULL;
 
 }
@@ -253,6 +254,13 @@ void CTimerDlg::DoDataExchange(CDataExchange* pDX)
       }   // end of having non-blank procedure
 
     }   // end of saving and validating
+  else
+    {
+    if (App.m_bFixedFontForEditing)
+      {
+      FixFont(m_font, m_ctlContents, App.m_strFixedPitchFont, App.m_iFixedPitchFontSize, FW_NORMAL, DEFAULT_CHARSET);
+      }
+    }
 
 }
 

diff --git a/dialogs/world_prefs/TimerDlg.h b/dialogs/world_prefs/TimerDlg.h
@@ -17,6 +17,7 @@ class CTimerDlg : public CDialog
 // Construction
 public:
 	CTimerDlg(CWnd* pParent = NULL);   // standard constructor
+  ~CTimerDlg() { delete m_font; };
 
 // Dialog Data
 	//{{AFX_DATA(CTimerDlg)
@@ -52,6 +53,7 @@ class CTimerDlg : public CDialog
 
   CTimerMap * m_pTimerMap;
   CTimer * m_current_timer;
+  CFont * m_font;
   CMUSHclientDoc * m_pDoc;