Fix alert font so it doesn't clash with displays around it, fix crash on tastudio close, fix play movie from beginning function

This commit is contained in:
andres.delikat 2011-06-12 21:36:03 +00:00
parent bda7db5633
commit 0894a20e4c
3 changed files with 11 additions and 4 deletions

View File

@ -2104,7 +2104,7 @@ namespace BizHawk.MultiClient
public void PlayMovieFromBeginning()
{
if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
{
LoadRom(CurrentlyOpenRom);
UserMovie.StartPlayback();

View File

@ -200,7 +200,7 @@ namespace BizHawk.MultiClient
Sprite = new Sprite(Device);
Texture = new ImageTexture(Device);
MessageFont = new Font(Device, 16, 0, FontWeight.Bold, 1, false, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
AlertFont = new Font(Device, 20, 0, FontWeight.ExtraBold, 1, true, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
AlertFont = new Font(Device, 16, 0, FontWeight.ExtraBold, 1, true, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
}
public void Render()

View File

@ -12,13 +12,16 @@ namespace BizHawk.MultiClient
public partial class TAStudio : Form
{
//TODO:
//Crash when closing TASStudio
//Right-click - Go to current frame
//Clicking a frame should go there
//Multiple timeline system
//Macro listview
// Double click brings up a macro editing window
//NES Controls virtualpad (Power-on & Reset, eventually FDS options)
//SMS virtualpad
//PCE virtualpad
//Dynamic virtualpad system based on platform
//ensureVisible when recording
int defaultWidth; //For saving the default size of the dialog, so the user can restore if desired
int defaultHeight;
@ -41,7 +44,11 @@ namespace BizHawk.MultiClient
public void UpdateValues()
{
DisplayList();
if (!this.IsHandleCreated || this.IsDisposed) return;
if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.INACTIVE)
TASView.ItemCount = 0;
else
DisplayList();
}
public string GetMnemonic()