From 6e9b10d4fd24b240986e06a9c14e05b4d8060b6b Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 28 Jul 2015 20:04:25 -0400 Subject: [PATCH] remove debugging try/catch --- .../tools/TAStudio/InputRoll.cs | 43 ++++++++----------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs index 8bde0646ba..9bdfaef598 100644 --- a/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs +++ b/BizHawk.Client.EmuHawk/tools/TAStudio/InputRoll.cs @@ -978,35 +978,28 @@ namespace BizHawk.Client.EmuHawk { if (DraggingCell != null) { - try + var text = ""; + if (QueryItemText != null) { - var text = ""; - if (QueryItemText != null) - { - QueryItemText(DraggingCell.RowIndex.Value, DraggingCell.Column, out text); - } - - Color bgColor = this.BackColor; - if (QueryItemBkColor != null) - { - QueryItemBkColor(DraggingCell.RowIndex.Value, DraggingCell.Column, ref bgColor); - } - - int x1 = _currentX.Value - (DraggingCell.Column.Width.Value / 2); - int y1 = _currentY.Value - (CellHeight / 2); - int x2 = x1 + DraggingCell.Column.Width.Value; - int y2 = y1 + CellHeight; - - - Gdi.SetBrush(bgColor); - Gdi.FillRectangle(x1, y1, x2 - x1, y2 - y1); - Gdi.PrepDrawString(this.NormalFont, this.ForeColor); - Gdi.DrawString(text, new Point(x1 + CellWidthPadding, y1 + CellHeightPadding)); + QueryItemText(DraggingCell.RowIndex.Value, DraggingCell.Column, out text); } - catch (Exception ex) + + Color bgColor = this.BackColor; + if (QueryItemBkColor != null) { - int zzz = 0; + QueryItemBkColor(DraggingCell.RowIndex.Value, DraggingCell.Column, ref bgColor); } + + int x1 = _currentX.Value - (DraggingCell.Column.Width.Value / 2); + int y1 = _currentY.Value - (CellHeight / 2); + int x2 = x1 + DraggingCell.Column.Width.Value; + int y2 = y1 + CellHeight; + + + Gdi.SetBrush(bgColor); + Gdi.FillRectangle(x1, y1, x2 - x1, y2 - y1); + Gdi.PrepDrawString(this.NormalFont, this.ForeColor); + Gdi.DrawString(text, new Point(x1 + CellWidthPadding, y1 + CellHeightPadding)); } }