ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rip out the Alert font from OSD Manager since it wasn't being used for anything useful anymore, Ram Watch on screen display - show frozen addresses in a cyan color instead of red to be consistent with the rest of the system

This commit is contained in:
adelikat 2014-04-27 13:01:10 +00:00
parent faa7da4fdb
commit bbf7c43b6d
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
BizHawk.Client.EmuHawk/DisplayManager/OSDManager.cs
View File

@ -35,7 +35,6 @@ namespace BizHawk.Client.EmuHawk
public string Message; public string Message;
public int X; public int X;
public int Y; public int Y;
public bool Alert;
public int Anchor; public int Anchor;
public Color ForeColor; public Color ForeColor;
public Color BackGround; public Color BackGround;
@ -46,7 +45,7 @@ namespace BizHawk.Client.EmuHawk
public string FPS { get; set; } public string FPS { get; set; }
public string MT { get; set; } public string MT { get; set; }
public IBlitterFont MessageFont; public IBlitterFont MessageFont;
public IBlitterFont AlertFont;
public void Dispose() public void Dispose()
{ {
@ -55,7 +54,6 @@ namespace BizHawk.Client.EmuHawk
public void Begin(IBlitter blitter) public void Begin(IBlitter blitter)
{ {
MessageFont = blitter.GetFontType("MessageFont"); MessageFont = blitter.GetFontType("MessageFont");
AlertFont = blitter.GetFontType("AlertFont");
} }
public System.Drawing.Color FixedMessagesColor { get { return System.Drawing.Color.FromArgb(Global.Config.MessagesColor); } } public System.Drawing.Color FixedMessagesColor { get { return System.Drawing.Color.FromArgb(Global.Config.MessagesColor); } }
@ -144,10 +142,18 @@ namespace BizHawk.Client.EmuHawk
messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) }); messages.Add(new UIMessage { Message = message, ExpireAt = DateTime.Now + TimeSpan.FromSeconds(2) });
} }
public void AddGUIText(string message, int x, int y, bool alert, Color BackGround, Color ForeColor, int anchor) public void AddGUIText(string message, int x, int y, Color backGround, Color foreColor, int anchor)
{ {
GlobalWin.DisplayManager.NeedsToPaint = true; GlobalWin.DisplayManager.NeedsToPaint = true;
GUITextList.Add(new UIDisplay { Message = message, X = x, Y = y, BackGround = BackGround, ForeColor = ForeColor, Alert = alert, Anchor = anchor }); GUITextList.Add(new UIDisplay
{
Message = message,
X = x,
Y = y,
BackGround = backGround,
ForeColor = foreColor,
Anchor = anchor
});
} }
public void ClearGUIText() public void ClearGUIText()
@ -197,6 +203,7 @@ namespace BizHawk.Client.EmuHawk
{ {
y -= ((line - 1) * 18); 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); g.DrawString(messages[i].Message, MessageFont, FixedMessagesColor, x, y);
} }
@ -210,12 +217,7 @@ namespace BizHawk.Client.EmuHawk
float posy = GetY(g, GUITextList[x].Y, GUITextList[x].Anchor, MessageFont, GUITextList[x].Message); float posy = GetY(g, GUITextList[x].Y, GUITextList[x].Anchor, MessageFont, GUITextList[x].Message);
g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].BackGround, posx + 2, posy + 2); g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].BackGround, posx + 2, posy + 2);
//g.DrawString(GUITextList[x].Message, MessageFont, Color.Gray, posx + 1, posy + 1); g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy);
if (GUITextList[x].Alert)
g.DrawString(GUITextList[x].Message, AlertFont, FixedMessagesColor, posx, posy);
else
g.DrawString(GUITextList[x].Message, MessageFont, GUITextList[x].ForeColor, posx, posy);
} }
catch (Exception) catch (Exception)
{ {
@ -309,10 +311,10 @@ namespace BizHawk.Client.EmuHawk
if (Global.Emulator.IsLagFrame) if (Global.Emulator.IsLagFrame)
{ {
float x = GetX(g, Global.Config.DispLagx, Global.Config.DispLaganchor, AlertFont, counter); float x = GetX(g, Global.Config.DispLagx, Global.Config.DispLaganchor, MessageFont, counter);
float y = GetY(g, Global.Config.DispLagy, Global.Config.DispLaganchor, AlertFont, counter); float y = GetY(g, Global.Config.DispLagy, Global.Config.DispLaganchor, MessageFont, counter);
g.DrawString(counter, AlertFont, Color.Black, x + 1, y + 1); g.DrawString(counter, MessageFont, Color.Black, x + 1, y + 1);
g.DrawString(counter, AlertFont, FixedAlertMessageColor, x, y); g.DrawString(counter, MessageFont, FixedAlertMessageColor, x, y);
} }
else else
{ {

2
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Gui.cs
View File

@ -520,7 +520,7 @@ namespace BizHawk.Client.EmuHawk
x *= EmuHawkLuaLibrary.GetWindowSize(); x *= EmuHawkLuaLibrary.GetWindowSize();
y *= EmuHawkLuaLibrary.GetWindowSize(); y *= EmuHawkLuaLibrary.GetWindowSize();
GlobalWin.OSD.AddGUIText(message, x, y, false, GetColor(background ?? "black"), GetColor(forecolor ?? "white"), a); GlobalWin.OSD.AddGUIText(message, x, y, GetColor(background ?? "black"), GetColor(forecolor ?? "white"), a);
} }
} }
} }

11
BizHawk.Client.EmuHawk/tools/Watch/RamWatch.cs
View File

@ -208,16 +208,15 @@ namespace BizHawk.Client.EmuHawk
if (Global.Config.DisplayRamWatch) if (Global.Config.DisplayRamWatch)
{ {
for (var x = 0; x < _watches.Count; x++) for (var i = 0; i < _watches.Count; i++)
{ {
var alert = !_watches[x].IsSeparator && Global.CheatList.IsActive(_watches[x].Domain, _watches[x].Address ?? 0); var frozen = !_watches[i].IsSeparator && Global.CheatList.IsActive(_watches[i].Domain, _watches[i].Address ?? 0);
GlobalWin.OSD.AddGUIText( GlobalWin.OSD.AddGUIText(
_watches[x].ToString(), _watches[i].ToString(),
Global.Config.DispRamWatchx, Global.Config.DispRamWatchx,
Global.Config.DispRamWatchy + (x * 14), Global.Config.DispRamWatchy + (i * 14),
alert,
Color.Black, Color.Black,
Color.White, frozen ? Color.Cyan : Color.White,
0 0
); );
} }