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

Input Roll - grid lines

This commit is contained in:
adelikat 2014-08-09 16:11:25 +00:00
parent 4b0efa8496
commit 0b9bb8095c
3 changed files with 136 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
BizHawk.Client.EmuHawk/CustomControls/GDITextRenderer.cs
View File

@ -220,6 +220,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
Rectangle(_hdc, nLeftRect, nTopRect, nRightRect, nBottomRect);
}
// TODO: use the "current brush" instead of grabbing a new one
public void SetBrush(Color color)
{
int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
@ -227,6 +228,7 @@ namespace BizHawk.Client.EmuHawk.CustomControls
}
private IntPtr _brush = IntPtr.Zero;
private IntPtr _pen = IntPtr.Zero;
public void FillRectangle(int x,int y, int w, int h)
{
@ -239,6 +241,13 @@ namespace BizHawk.Client.EmuHawk.CustomControls
MoveToEx(_hdc, x, y, IntPtr.Zero);
}
public void SetSolidPen(Color color)
{
int rgb = (color.B & 0xFF) << 16 | (color.G & 0xFF) << 8 | color.R;
SelectObject(_hdc, GetStockObject((int)PaintObjects.DC_PEN));
SetDCPenColor(_hdc, rgb);
}
public void Line(int x1, int y1, int x2, int y2)
{
MoveToEx(_hdc, x1, y1, IntPtr.Zero);
@ -293,8 +302,6 @@ namespace BizHawk.Client.EmuHawk.CustomControls
#endregion
#region Imports
[DllImport("user32.dll")]
@ -342,12 +349,21 @@ namespace BizHawk.Client.EmuHawk.CustomControls
[DllImport("gdi32.dll")]
private static extern IntPtr CreateSolidBrush(int color);
[DllImport("gdi32.dll")]
private static extern IntPtr CreatePen(int fnPenStyle, int nWidth, int color);
[DllImport("gdi32.dll")]
private static extern IntPtr MoveToEx(IntPtr hdc, int x, int y, IntPtr point);
[DllImport("gdi32.dll")]
private static extern IntPtr LineTo(IntPtr hdc, int nXEnd, int nYEnd);
[DllImport("gdi32.dll")]
private static extern IntPtr GetStockObject(int fnObject);
[DllImport("gdi32.dll")]
private static extern IntPtr SetDCPenColor(IntPtr hdc, int crColor);
#endregion
}
@ -380,5 +396,34 @@ namespace BizHawk.Client.EmuHawk.CustomControls
NoFullWidthCharBreak = 0x00080000,
HidePrefix = 0x00100000,
ProfixOnly = 0x00200000,
}
}
[Flags]
public enum PenStyles
{
PS_SOLID = 0x00000000
// TODO
}
public enum PaintObjects
{
WHITE_BRUSH = 0,
LTGRAY_BRUSH = 1,
GRAY_BRUSH = 2,
DKGRAY_BRUSH = 3,
BLACK_BRUSH = 4,
NULL_BRUSH = 5,
WHITE_PEN = 6,
BLACK_PEN = 7,
NULL_PEN = 8,
OEM_FIXED_FONT = 10,
ANSI_FIXED_FONT = 11,
ANSI_VAR_FONT = 12,
SYSTEM_FONT = 13,
DEVICE_DEFAULT_FONT = 14,
DEFAULT_PALETTE = 15,
SYSTEM_FIXED_FONT = 16,
DC_BRUSH = 18,
DC_PEN = 19,
}
}

91
BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs
View File

@ -17,6 +17,7 @@ namespace BizHawk.Client.EmuHawk
private bool NeedToReDrawColumn = false;
private int _horizontalOrientedColumnWidth = 0;
private Size _charSize;
public InputRoll()
{
@ -25,10 +26,12 @@ namespace BizHawk.Client.EmuHawk
SetStyle(ControlStyles.AllPaintingInWmPaint, true);
SetStyle(ControlStyles.SupportsTransparentBackColor, true);
SetStyle(ControlStyles.Opaque, true);
this.Font = new Font("Courier New", 8);
this.Font = new Font("Courier New", 8); // Only support fixed width
//BackColor = Color.Transparent;
Gdi = new GDIRenderer(this);
_charSize = Gdi.MeasureString("A", this.Font);
}
#region Properties
@ -126,49 +129,76 @@ namespace BizHawk.Client.EmuHawk
private void DrawColumnBg(GDIRenderer gdi, PaintEventArgs e)
{
gdi.SetBrush(SystemColors.ControlLight);
gdi.SetSolidPen(Color.Black);
if (HorizontalOrientation)
{
var colWidth = _horizontalOrientedColumnWidth;
gdi.DrawRectangle(0, 0, colWidth, Height - 2);
gdi.FillRectangle(1, 1, colWidth - 1, Height - 3);
gdi.DrawRectangle(0, 0, colWidth, Height);
gdi.FillRectangle(1, 1, colWidth - 3, Height - 3);
int start = 0;
foreach (var column in Columns)
{
start += CellHeight;
gdi.Line(0, start, colWidth, start);
gdi.Line(1, start, colWidth - 1, start);
}
}
else
{
gdi.DrawRectangle(0, 0, Width - 2, CellHeight);
gdi.FillRectangle(1, 1, Width - 3, CellHeight - 1);
gdi.DrawRectangle(0, 0, Width, CellHeight);
gdi.FillRectangle(1, 1, Width - 3, CellHeight - 3);
int start = 0;
foreach (var column in Columns)
{
start += column.Width;
start += CalcWidth(column);
gdi.Line(start, 0, start, CellHeight);
}
}
}
private void DrawBg(GDIRenderer ntr, PaintEventArgs e)
private void DrawBg(GDIRenderer gdi, PaintEventArgs e)
{
var start = StartBg();
var startPoint = StartBg();
ntr.SetBrush(Color.White);
ntr.FillRectangle(start.X, start.Y, Width, Height);
ntr.DrawRectangle(start.X, start.Y, Width, Height);
gdi.SetBrush(Color.White);
gdi.SetSolidPen(Color.Black);
gdi.FillRectangle(startPoint.X, startPoint.Y, Width, Height);
gdi.DrawRectangle(startPoint.X, startPoint.Y, Width, Height);
gdi.SetSolidPen(SystemColors.ControlLight);
if (HorizontalOrientation)
{
// Columns
for (int i = 1; i < Width / CellWidth; i++)
{
var x = _horizontalOrientedColumnWidth + (i * CellWidth);
gdi.Line(x, 1, x, Columns.Count * CellHeight);
}
// Rows
for (int i = 1; i < Columns.Count + 1; i++)
{
gdi.Line(_horizontalOrientedColumnWidth, i * CellHeight, Width - 2, i * CellHeight);
}
}
else
{
// Columns
int x = 0;
int y = CellHeight;
foreach (var column in Columns)
{
x += CalcWidth(column);
gdi.Line(x, y, x, Height - 1);
}
// Rows
for (int i = 2; i < Height / CellHeight; i++)
{
gdi.Line(1, (i * CellHeight) + 1, Width - 2, (i * CellHeight) + 1);
}
}
}
@ -196,7 +226,7 @@ namespace BizHawk.Client.EmuHawk
var point = new Point(start + CellPadding, CellPadding);
gdi.PrepDrawString(column.Text, this.Font, this.ForeColor, point);
gdi.DrawString(column.Text, this.Font, Color.Black, point);
start += column.Width;
start += CalcWidth(column);
}
}
}
@ -247,14 +277,14 @@ namespace BizHawk.Client.EmuHawk
{
if (HorizontalOrientation)
{
var x = _horizontalOrientedColumnWidth;
var x = _horizontalOrientedColumnWidth - 1;
var y = 0;
return new Point(x, y);
}
else
{
var x = 0;
var y = CellHeight;
var y = CellHeight - 1;
return new Point(x, y);
}
}
@ -266,15 +296,15 @@ namespace BizHawk.Client.EmuHawk
{
get
{
return this.Font.Height + (CellPadding * 2);
return _charSize.Height + (CellPadding * 2);
}
}
private int TextWidth
private int CellWidth
{
get
{
return 15;
return _charSize.Width + (CellPadding * 4); // Double the padding for horizontal because it looks better
}
}
@ -284,7 +314,7 @@ namespace BizHawk.Client.EmuHawk
{
if (HorizontalOrientation)
{
return Width / TextWidth > ItemCount;
return Width / CellWidth > ItemCount;
}
return Height / CellHeight > ItemCount;
@ -294,7 +324,13 @@ namespace BizHawk.Client.EmuHawk
private void ColumnChanged()
{
NeedToReDrawColumn = true;
_horizontalOrientedColumnWidth = (Columns.Max(c => c.Text.Length) * TextWidth) + (CellPadding * 2);
var text = Columns.Max(c => c.Text.Length);
_horizontalOrientedColumnWidth = (text * _charSize.Width) + (CellPadding * 2);
}
private int CalcWidth(RollColumn col)
{
return col.Width ?? ((col.Text.Length * _charSize.Width) + (CellPadding * 4));
}
#endregion
@ -312,13 +348,24 @@ namespace BizHawk.Client.EmuHawk
Type = type
});
}
public IEnumerable<string> Groups
{
get
{
return this
.Select(x => x.Group)
.Distinct();
}
}
}
public class RollColumn
{
public enum InputType { Boolean, Float, Text }
public enum InputType { Boolean, Float, Text, Image }
public int Width { get; set; }
public string Group { get; set; }
public int? Width { get; set; }
public string Name { get; set; }
public string Text { get; set; }
public InputType Type { get; set; }

28
BizHawk.Client.EmuHawk/tools/TAStudio/TasStudioExperiment.cs
View File

@ -59,63 +59,73 @@ namespace BizHawk.Client.EmuHawk
{
new RollColumn
{
Group = "Core",
Name = "MarkerColumn",
Text = "",
Width = 40,
Width = 23,
},
new RollColumn
{
Group = "Core",
Name = "FrameColumn",
Text = "Frame",
Width = 50,
},
new RollColumn
{
Group = "P1",
Name = "P1 Up",
Text = "U",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 Down",
Text = "D",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 Left",
Text = "L",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 Right",
Text = "R",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 Select",
Text = "s",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 Start",
Text = "S",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 B",
Text = "B",
Width = 23,
Type = RollColumn.InputType.Boolean
},
new RollColumn
{
Group = "P1",
Name = "P1 A",
Text = "A",
Width = 23,
Type = RollColumn.InputType.Boolean
},
});
}