NES PPU - fix Pattern view palette selection via click
This commit is contained in:
parent
50a06e38cd
commit
21d7f5c79f
|
@ -183,7 +183,7 @@
|
||||||
this.PatternView.Name = "PatternView";
|
this.PatternView.Name = "PatternView";
|
||||||
this.PatternView.Size = new System.Drawing.Size(256, 128);
|
this.PatternView.Size = new System.Drawing.Size(256, 128);
|
||||||
this.PatternView.TabIndex = 0;
|
this.PatternView.TabIndex = 0;
|
||||||
this.PatternView.Click += new System.EventHandler(this.PatternView_Click);
|
this.PatternView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PatternView_Click);
|
||||||
//
|
//
|
||||||
// NESPPU
|
// NESPPU
|
||||||
//
|
//
|
||||||
|
|
|
@ -179,9 +179,19 @@ namespace BizHawk.MultiClient
|
||||||
saveWindowPositionToolStripMenuItem.Checked = Global.Config.NESPPUSaveWindowPosition;
|
saveWindowPositionToolStripMenuItem.Checked = Global.Config.NESPPUSaveWindowPosition;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void PatternView_Click(object sender, EventArgs e)
|
private void PatternView_Click(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
//TODO: these values are off by 1 because it gets triggered before the PatternViewer_Click event
|
if (e.X < PatternView.Width / 2)
|
||||||
|
{
|
||||||
|
PatternView.Pal0++;
|
||||||
|
if (PatternView.Pal0 > 7) PatternView.Pal0 = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PatternView.Pal1++;
|
||||||
|
if (PatternView.Pal1 > 7) PatternView.Pal1 = 0;
|
||||||
|
}
|
||||||
|
PatternView.Refresh();
|
||||||
Table1PaletteLabel.Text = "Palette: " + PatternView.Pal0;
|
Table1PaletteLabel.Text = "Palette: " + PatternView.Pal0;
|
||||||
Table2PaletteLabel.Text = "Palette: " + PatternView.Pal1;
|
Table2PaletteLabel.Text = "Palette: " + PatternView.Pal1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,17 +55,7 @@ namespace BizHawk.MultiClient
|
||||||
|
|
||||||
private void PatternViewer_Click(object sender, MouseEventArgs e)
|
private void PatternViewer_Click(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.X < (this.Size.Width / 2))
|
//Moved to parent event handler
|
||||||
{
|
|
||||||
Pal0++;
|
|
||||||
if (Pal0 > 7) Pal0 = 0;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Pal1++;
|
|
||||||
if (Pal1 > 7) Pal1 = 0;
|
|
||||||
}
|
|
||||||
this.Refresh();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue