From 1928d04137b26cd404d8b87458b6cf872eb0aed3 Mon Sep 17 00:00:00 2001 From: feos Date: Thu, 26 Nov 2015 22:51:48 +0300 Subject: [PATCH] default font now has halo. if someone really prefers the shadow way (why would anyone?), it can be made optional. well, halo color can't be edited. regarding lua, this only affects gui.text, since it uses the same bitmap font. --- .../DisplayManager/OSDManager.cs | 10 +- .../Resources/courier16px.bmfc | 6 +- .../Resources/courier16px.fnt | 317 +++++++----------- .../Resources/courier16px_0.png | Bin 4014 -> 4424 bytes 4 files changed, 124 insertions(+), 209 deletions(-) diff --git a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs index 5ef71fa72b..45cd069bff 100644 --- a/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs +++ b/BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs @@ -181,7 +181,7 @@ namespace BizHawk.Client.EmuHawk y -= ((line - 1) * 18); } - g.DrawString(messages[i].Message, MessageFont, Color.Black, x + 2, y + 2); + //g.DrawString(messages[i].Message, MessageFont, Color.Black, x + 2, y + 2); g.DrawString(messages[i].Message, MessageFont, FixedMessagesColor, x, y); } } @@ -202,7 +202,7 @@ namespace BizHawk.Client.EmuHawk y -= ((line - 1) * 18); } - g.DrawString(messages[i].Message, MessageFont, Color.Black, x + 2, y + 2); + //g.DrawString(messages[i].Message, MessageFont, Color.Black, x + 2, y + 2); g.DrawString(messages[i].Message, MessageFont, FixedMessagesColor, x, y); } } @@ -214,7 +214,7 @@ namespace BizHawk.Client.EmuHawk float posx = GetX(g, text.X, text.Anchor, text.Message); float posy = GetY(g, text.Y, text.Anchor, text.Message); - g.DrawString(text.Message, MessageFont, text.BackGround, posx + 2, posy + 2); + //g.DrawString(text.Message, MessageFont, text.BackGround, posx + 2, posy + 2); g.DrawString(text.Message, MessageFont, text.ForeColor, posx, posy); } catch (Exception) @@ -312,7 +312,7 @@ namespace BizHawk.Client.EmuHawk private void DrawOsdMessage(IBlitter g, string message, Color color, float x, float y) { - g.DrawString(message, MessageFont, Color.Black, x + 1, y + 1); + //g.DrawString(message, MessageFont, Color.Black, x + 1, y + 1); g.DrawString(message, MessageFont, color, x, y); } @@ -343,7 +343,7 @@ namespace BizHawk.Client.EmuHawk var x = GetX(g, Global.Config.DispInpx, Global.Config.DispInpanchor, input); var y = GetY(g, Global.Config.DispInpy, Global.Config.DispInpanchor, input); Color c = Color.FromArgb(Global.Config.MovieInput); - g.DrawString(input, MessageFont, Color.Black, x + 1, y + 1); + //g.DrawString(input, MessageFont, Color.Black, x + 1, y + 1); g.DrawString(input, MessageFont, c, x, y); } diff --git a/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc b/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc index df09355333..a84a08dcfc 100644 --- a/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc +++ b/BizHawk.Client.EmuHawk/Resources/courier16px.bmfc @@ -4,7 +4,7 @@ fileVersion=1 # font settings fontName=Courier fontFile= -charSet=0 +charSet=204 fontSize=16 aa=1 scaleH=100 @@ -47,9 +47,9 @@ invG=0 invB=0 # outline -outlineThickness=0 +outlineThickness=2 # selected chars -chars=32-127,129,141,143-144,157,160-255 +chars=32-127,152,160,164,166-167,169,171-174,176-177,181-183,187 # imported icon images diff --git a/BizHawk.Client.EmuHawk/Resources/courier16px.fnt b/BizHawk.Client.EmuHawk/Resources/courier16px.fnt index 0e8d5e8a1f..baa19f91e1 100644 --- a/BizHawk.Client.EmuHawk/Resources/courier16px.fnt +++ b/BizHawk.Client.EmuHawk/Resources/courier16px.fnt @@ -1,208 +1,123 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/BizHawk.Client.EmuHawk/Resources/courier16px_0.png b/BizHawk.Client.EmuHawk/Resources/courier16px_0.png index bad54fe855b6aa1ca09bf066a571c83ab32bf973..c73de1e8647a2c19f915f1093450c55b56bd67ea 100644 GIT binary patch literal 4424 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