Fix clash between fps & frame counter display positions, make all the display counter positions a variable in the config file.

This commit is contained in:
andres.delikat 2011-03-20 14:08:35 +00:00
parent f84de1750e
commit 55e5986e97
2 changed files with 11 additions and 3 deletions

View File

@ -39,9 +39,17 @@
// Display options
public bool DisplayFPS = false;
public int DispFPSx = 0;
public int DispFPSy = 0;
public bool DisplayFrameCounter = false;
public int DispFrameCx = 0;
public int DispFrameCy = 12;
public bool DisplayLagCounter = false;
public int DispLagx = 0;
public int DispLagy = 36;
public bool DisplayInput = false;
public int DispInpx = 0;
public int DispInpy = 24;
// Sound options
public bool SoundEnabled = true;

View File

@ -258,16 +258,16 @@ namespace BizHawk.MultiClient
{
//TODO: If movie loaded use that frame counter, and also display total movie frame count if read-only
if (Global.Config.DisplayFrameCounter)
MessageFont.DrawString(null, MakeFrameCounter(), 1, 1, new Color4(Color.White)); //TODO: Allow user to set screen coordinates?
MessageFont.DrawString(null, MakeFrameCounter(), Global.Config.DispFrameCx, Global.Config.DispFrameCy, new Color4(Color.White)); //TODO: Allow user to set screen coordinates?
if (Global.Config.DisplayInput)
{
string input = MakeInputDisplay();
MessageFont.DrawString(null, input, 1, 16, new Color4(Color.White));
MessageFont.DrawString(null, input, Global.Config.DispInpx, Global.Config.DispInpy, new Color4(Color.White));
}
if (Global.Config.DisplayFPS)
MessageFont.DrawString(null, FPS.ToString(), 0, 0, new Color4(Color.White));
MessageFont.DrawString(null, FPS.ToString() + " fps", Global.Config.DispFPSx, Global.Config.DispFPSy, new Color4(Color.White));
}
private string MakeFrameCounter()