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

InputRoll - misc cleanups

This commit is contained in:
adelikat 2019-10-26 16:04:27 -05:00
parent 179e71efee
commit af59d2fe6b
3 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
BizHawk.Client.EmuHawk/CustomControls/InputRoll.Drawing.cs
View File

@ -3,6 +3,7 @@ using System.Collections.Generic;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Client.EmuHawk.WinFormExtensions;
namespace BizHawk.Client.EmuHawk namespace BizHawk.Client.EmuHawk
{ {
@ -58,7 +59,7 @@ namespace BizHawk.Client.EmuHawk
_renderer.DrawString(text, point); _renderer.DrawString(text, point);
} }
protected override void OnPaintBackground(PaintEventArgs pevent) protected override void OnPaintBackground(PaintEventArgs e)
{ {
// Do nothing, and this should never be called // Do nothing, and this should never be called
} }
@ -312,10 +313,10 @@ namespace BizHawk.Client.EmuHawk
_renderer.Line(0, 0, TotalColWidth.Value + 1, 0); _renderer.Line(0, 0, TotalColWidth.Value + 1, 0);
_renderer.Line(0, bottomEdge, TotalColWidth.Value + 1, bottomEdge); _renderer.Line(0, bottomEdge, TotalColWidth.Value + 1, bottomEdge);
// Vertical black seperators // Vertical black separators
for (int i = 0; i < visibleColumns.Count; i++) foreach (var column in visibleColumns)
{ {
int pos = visibleColumns[i].Left.Value - _hBar.Value; int pos = column.Left.Value - _hBar.Value;
_renderer.Line(pos, 0, pos, bottomEdge); _renderer.Line(pos, 0, pos, bottomEdge);
} }
@ -353,14 +354,9 @@ namespace BizHawk.Client.EmuHawk
continue; continue;
} }
if (CurrentCell.Column.Emphasis) _renderer.SetBrush(CurrentCell.Column.Emphasis
{ ? SystemColors.Highlight.Add(0x00222222)
_renderer.SetBrush(Add(SystemColors.Highlight, 0x00222222)); : SystemColors.Highlight);
}
else
{
_renderer.SetBrush(SystemColors.Highlight);
}
_renderer.FillRectangle(1, i * CellHeight + 1, ColumnWidth - 1, ColumnHeight - 1); _renderer.FillRectangle(1, i * CellHeight + 1, ColumnWidth - 1, ColumnHeight - 1);
} }
@ -368,27 +364,22 @@ namespace BizHawk.Client.EmuHawk
else else
{ {
// TODO multiple selected columns // TODO multiple selected columns
for (int i = 0; i < visibleColumns.Count; i++) foreach (var column in visibleColumns)
{ {
if (visibleColumns[i] == CurrentCell.Column) if (column == CurrentCell.Column)
{ {
// Left of column is to the right of the viewable area or right of column is to the left of the viewable area // Left of column is to the right of the viewable area or right of column is to the left of the viewable area
if (visibleColumns[i].Left.Value - _hBar.Value > Width || visibleColumns[i].Right.Value - _hBar.Value < 0) if (column.Left.Value - _hBar.Value > Width || column.Right.Value - _hBar.Value < 0)
{ {
continue; continue;
} }
int left = visibleColumns[i].Left.Value - _hBar.Value; int left = column.Left.Value - _hBar.Value;
int width = visibleColumns[i].Right.Value - _hBar.Value - left; int width = column.Right.Value - _hBar.Value - left;
if (CurrentCell.Column.Emphasis) _renderer.SetBrush(CurrentCell.Column.Emphasis
{ ? SystemColors.Highlight.Add(0x00550000)
_renderer.SetBrush(Add(SystemColors.Highlight, 0x00550000)); : SystemColors.Highlight);
}
else
{
_renderer.SetBrush(SystemColors.Highlight);
}
_renderer.FillRectangle(left + 1, 1, width - 1, ColumnHeight - 1); _renderer.FillRectangle(left + 1, 1, width - 1, ColumnHeight - 1);
} }
@ -460,11 +451,11 @@ namespace BizHawk.Client.EmuHawk
{ {
// SuuperW: This allows user to see other colors in selected frames. // SuuperW: This allows user to see other colors in selected frames.
Color rowColor = Color.White; Color rowColor = Color.White;
int _lastVisibleRow = LastVisibleRow; int lastVisibleRow = LastVisibleRow;
int lastRow = -1; int lastRow = -1;
foreach (Cell cell in _selectedItems) foreach (Cell cell in _selectedItems)
{ {
if (cell.RowIndex > _lastVisibleRow || cell.RowIndex < FirstVisibleRow || !VisibleColumns.Contains(cell.Column)) if (cell.RowIndex > lastVisibleRow || cell.RowIndex < FirstVisibleRow || !VisibleColumns.Contains(cell.Column))
{ {
continue; continue;
} }

8
BizHawk.Client.EmuHawk/CustomControls/InputRoll.cs
View File

@ -1599,14 +1599,6 @@ namespace BizHawk.Client.EmuHawk
#region Helpers #region Helpers
// TODO: Make into an extension method
private static Color Add(Color color, int val)
{
var col = color.ToArgb();
col += val;
return Color.FromArgb(col);
}
private void DoColumnReorder() private void DoColumnReorder()
{ {
if (_columnDown != CurrentCell.Column) if (_columnDown != CurrentCell.Column)

10
BizHawk.Client.EmuHawk/Extensions/ControlExtensions.cs
View File

@ -7,10 +7,7 @@ using System.Runtime.InteropServices;
using System.Text; using System.Text;
using System.Windows.Forms; using System.Windows.Forms;
using BizHawk.Common;
using BizHawk.Common.ReflectionExtensions; using BizHawk.Common.ReflectionExtensions;
using BizHawk.Client.Common;
namespace BizHawk.Client.EmuHawk.WinFormExtensions namespace BizHawk.Client.EmuHawk.WinFormExtensions
{ {
@ -84,6 +81,13 @@ namespace BizHawk.Client.EmuHawk.WinFormExtensions
return control.PointToScreen(new Point(child.Location.X, child.Location.Y)); return control.PointToScreen(new Point(child.Location.X, child.Location.Y));
} }
public static Color Add(this Color color, int val)
{
var col = color.ToArgb();
col += val;
return Color.FromArgb(col);
}
#region Enumerable to Enumerable<T> #region Enumerable to Enumerable<T>
/// <summary> /// <summary>