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

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

Revision: 4706
          http://sourceforge.net/p/modplug/code/4706
Author:   saga-games
Date:     2015-01-08 23:41:32 +0000 (Thu, 08 Jan 2015)
Log Message:
-----------
[Fix] Channel borders were not drawn properly with zoomed fonts.
[Mod] Change character for empty cells in custom pattern fonts from mid-dot to regular dot, so that it looks better in fonts that lack unicode character (such as Terminal), and since it actually matches OpenMPT's default font better.
[Mod] OpenMPT: Version is now 1.24.01.05

Modified Paths:
--------------
    trunk/OpenMPT/common/versionNumber.h
    trunk/OpenMPT/mptrack/PatternFont.cpp

Modified: trunk/OpenMPT/common/versionNumber.h
===================================================================
--- trunk/OpenMPT/common/versionNumber.h	2015-01-08 22:24:04 UTC (rev 4705)
+++ trunk/OpenMPT/common/versionNumber.h	2015-01-08 23:41:32 UTC (rev 4706)
@@ -19,7 +19,7 @@
 #define VER_MAJORMAJOR          1
 #define VER_MAJOR               24
 #define VER_MINOR               01
-#define VER_MINORMINOR          04
+#define VER_MINORMINOR          05
 
 //Version string. For example "1.17.02.28"
 #define MPT_VERSION_STR         VER_STRINGIZE(VER_MAJORMAJOR) "." VER_STRINGIZE(VER_MAJOR) "." VER_STRINGIZE(VER_MINOR) "." VER_STRINGIZE(VER_MINORMINOR)

Modified: trunk/OpenMPT/mptrack/PatternFont.cpp
===================================================================
--- trunk/OpenMPT/mptrack/PatternFont.cpp	2015-01-08 22:24:04 UTC (rev 4705)
+++ trunk/OpenMPT/mptrack/PatternFont.cpp	2015-01-08 23:41:32 UTC (rev 4706)
@@ -228,7 +228,7 @@
 
 		// Create 4-pixel border
 		const int bmWidth2 = pf.dib->bmiHeader.biWidth / 2;
-		for(int y = 0, x = pf.nClrY * bmWidth2 + (pf.nClrX + pf.nWidth - 4) / 2; y < pf.nHeight; y++, x += bmWidth2)
+		for(int y = 0, x = (customFontBitmap.bmiHeader.biHeight - pf.nClrY - pf.nHeight) * bmWidth2 + (pf.nClrX + pf.nWidth - 4) / 2; y < pf.nHeight; y++, x += bmWidth2)
 		{
 			pf.dib->lpDibBits[x] = 0xEC;
 			pf.dib->lpDibBits[x + 1] = 0xC4;
@@ -329,7 +329,7 @@
 		uint8_t dot = dots[cell];
 		for(int i = 0; dot != 0; i++)
 		{
-			if(dot & 1) DrawChar(hDC, L'\u00B7', pf.nClrX + offset + i * charWidth, pf.nClrY, charWidth, charHeight);
+			if(dot & 1) DrawChar(hDC, '.', pf.nClrX + offset + i * charWidth, pf.nClrY, charWidth, charHeight);
 			dot >>= 1;
 		}
 		offset += pf.nEltWidths[cell];

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