[OMPT-svn-commit] OpenMPT r22153 - trunk/OpenMPT/mptrack

[<sv...@op...>]

Author: sagamusix
Date: Sun Nov 10 22:35:58 2024
New Revision: 22153
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22153

Log:
[Ref] Make comments font non-static.

Modified:
   trunk/OpenMPT/mptrack/Ctrl_com.cpp
   trunk/OpenMPT/mptrack/MainFrm.cpp
   trunk/OpenMPT/mptrack/Mainfrm.h

Modified: trunk/OpenMPT/mptrack/Ctrl_com.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/Ctrl_com.cpp	Sun Nov 10 22:31:50 2024	(r22152)
+++ trunk/OpenMPT/mptrack/Ctrl_com.cpp	Sun Nov 10 22:35:58 2024	(r22153)
@@ -145,7 +145,7 @@
 		return;
 	LockControls();
 
-	HFONT &hFont = CMainFrame::GetCommentsFont();
+	CFont &hFont = CMainFrame::GetMainFrame()->GetCommentsFont();
 	static FontSetting previousFont;
 	static int previousFontSize = 0;
 	FontSetting font = TrackerSettings::Instance().commentsFont;
@@ -155,14 +155,14 @@
 	{
 		previousFont = font;
 		previousFontSize = fontSize;
-		DeleteFont(hFont);
-		hFont = ::CreateFont(fontSize, 0, 0, 0, font.flags[FontSetting::Bold] ? FW_BOLD : FW_NORMAL,
+		hFont.DeleteObject();
+		hFont.CreateFont(fontSize, 0, 0, 0, font.flags[FontSetting::Bold] ? FW_BOLD : FW_NORMAL,
 			font.flags[FontSetting::Italic] ? TRUE :FALSE, FALSE, FALSE,
 			DEFAULT_CHARSET, OUT_DEFAULT_PRECIS,
 			CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY,
 			FIXED_PITCH | FF_MODERN, mpt::ToCString(font.name));
 	}
-	m_EditComments.SendMessage(WM_SETFONT, reinterpret_cast<WPARAM>(hFont));
+	m_EditComments.SendMessage(WM_SETFONT, reinterpret_cast<WPARAM>(hFont.m_hObject));
 	CDC *pDC = m_EditComments.GetDC();
 	pDC->SelectObject(hFont);
 	TEXTMETRIC tm;

Modified: trunk/OpenMPT/mptrack/MainFrm.cpp
==============================================================================
--- trunk/OpenMPT/mptrack/MainFrm.cpp	Sun Nov 10 22:31:50 2024	(r22152)
+++ trunk/OpenMPT/mptrack/MainFrm.cpp	Sun Nov 10 22:35:58 2024	(r22153)
@@ -161,7 +161,6 @@
 // GDI
 HICON CMainFrame::m_hIcon = nullptr;
 CFont CMainFrame::m_hGUIFont;
-HFONT CMainFrame::m_hFixedFont = nullptr;
 HPEN CMainFrame::penDarkGray = nullptr;
 HPEN CMainFrame::penGray99 = nullptr;
 HPEN CMainFrame::penHalfDarkGray = nullptr;
@@ -404,8 +403,8 @@
 	m_hGUIFont.DeleteObject();
 #define DeleteGDIObject(h) ::DeleteObject(h); h = NULL;
 	DeleteGDIObject(penDarkGray);
-	DeleteGDIObject(m_hFixedFont);
 	DeleteGDIObject(penGray99);
+	DeleteGDIObject(penHalfDarkGray);
 #undef DeleteGDIObject
 
 	return CMDIFrameWnd::DestroyWindow();

Modified: trunk/OpenMPT/mptrack/Mainfrm.h
==============================================================================
--- trunk/OpenMPT/mptrack/Mainfrm.h	Sun Nov 10 22:31:50 2024	(r22152)
+++ trunk/OpenMPT/mptrack/Mainfrm.h	Sun Nov 10 22:35:58 2024	(r22153)
@@ -147,9 +147,9 @@
 	static HHOOK g_focusHook;
 
 	// GDI
-	static HICON m_hIcon;
+	CFont m_hCommentsFont;
 	static CFont m_hGUIFont;
-	static HFONT m_hFixedFont;
+	static HICON m_hIcon;
 	static HPEN penDarkGray, penHalfDarkGray, penGray99;
 	static HCURSOR curDragging, curNoDrop, curArrow, curNoDrop2, curVSplit;
 	static MODPLUGDIB *bmpNotes;
@@ -261,12 +261,13 @@
 	static void UpdateColors();
 	static HICON GetModIcon() { return m_hIcon; }
 	static HFONT GetGUIFont() { return m_hGUIFont; }
-	static HFONT &GetCommentsFont() { return m_hFixedFont; }
 	static LRESULT CALLBACK FocusChangeProc(int code, WPARAM wParam, LPARAM lParam);
 	static CInputHandler *m_InputHandler;
 
 	// Misc functions
 public:
+	CFont &GetCommentsFont() { return m_hCommentsFont; }
+
 	void SetUserText(LPCTSTR lpszText);
 	void SetInfoText(LPCTSTR lpszText);
 	void SetXInfoText(LPCTSTR lpszText);