[OMPT-svn-commit] SF.net SVN: modplug:[4779] trunk/OpenMPT/mptrack

[<sag...@us...>]

Revision: 4779
          http://sourceforge.net/p/modplug/code/4779
Author:   saga-games
Date:     2015-02-21 17:39:59 +0000 (Sat, 21 Feb 2015)
Log Message:
-----------
[Fix] The bold and italic styles were ignored on custom pattern / comments fonts.

Modified Paths:
--------------
    trunk/OpenMPT/mptrack/TrackerSettings.cpp
    trunk/OpenMPT/mptrack/TrackerSettings.h

Modified: trunk/OpenMPT/mptrack/TrackerSettings.cpp
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-02-21 01:11:38 UTC (rev 4778)
+++ trunk/OpenMPT/mptrack/TrackerSettings.cpp	2015-02-21 17:39:59 UTC (rev 4779)
@@ -544,14 +544,8 @@
 	}
 	if(storedVersion < MAKE_VERSION_NUMERIC(1,24,01,04))
 	{
-		if(m_dwPatternSetup & 0x02)
-			commentsFont = FontSetting("Courier New", 120);
-		else
-			commentsFont = FontSetting("Courier New", 90);
-		if(m_dwPatternSetup & 0x08)
-			patternFont = FontSetting(PATTERNFONT_SMALL, 0);
-		else
-			patternFont = FontSetting(PATTERNFONT_LARGE, 0);
+		commentsFont = FontSetting("Courier New", (m_dwPatternSetup & 0x02) ? 120 : 90);
+		patternFont = FontSetting((m_dwPatternSetup & 0x08) ? PATTERNFONT_SMALL : PATTERNFONT_LARGE, 0);
 		m_dwPatternSetup &= ~(0x08 | 0x02);
 	}
 

Modified: trunk/OpenMPT/mptrack/TrackerSettings.h
===================================================================
--- trunk/OpenMPT/mptrack/TrackerSettings.h	2015-02-21 01:11:38 UTC (rev 4778)
+++ trunk/OpenMPT/mptrack/TrackerSettings.h	2015-02-21 17:39:59 UTC (rev 4779)
@@ -341,6 +341,7 @@
 	int32_t size;
 	FlagSet<FontFlags> flags;
 
+	FontSetting(const FontSetting &other) : name(other.name), size(other.size), flags(other.flags) { }
 	FontSetting(const std::string &name = "", int32_t size = 120, FontFlags flags = None) : name(name), size(size), flags(flags) { }
 
 	bool operator== (const FontSetting &other) const
@@ -367,7 +368,7 @@
 	if(sizeStart != std::string::npos)
 	{
 		setting.size = atoi(&setting.name[sizeStart + 1]);
-		size_t flagsStart = setting.name.find(' ', sizeStart + 1);
+		size_t flagsStart = setting.name.find('|', sizeStart + 1);
 		if(flagsStart != std::string::npos)
 		{
 			setting.flags = static_cast<FontSetting::FontFlags>(atoi(&setting.name[flagsStart + 1]));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.