HexEditor: member Width, Height hide the original property Width, Height. So renamed to Width_, Height_

This commit is contained in:
taotao54321 2012-03-09 16:37:55 +00:00
parent baf189b464
commit 389693e6f4
1 changed files with 8 additions and 8 deletions

View File

@ -49,8 +49,8 @@ namespace BizHawk.MultiClient
bool SaveWindowPosition; bool SaveWindowPosition;
int Wndx = -1; int Wndx = -1;
int Wndy = -1; int Wndy = -1;
int Width = -1; int Width_ = -1;
int Height = -1; int Height_ = -1;
bool BigEndian; bool BigEndian;
int DataSize; int DataSize;
@ -72,8 +72,8 @@ namespace BizHawk.MultiClient
SaveWindowPosition = Global.Config.SaveWindowPosition; SaveWindowPosition = Global.Config.SaveWindowPosition;
Wndx = Global.Config.HexEditorWndx; Wndx = Global.Config.HexEditorWndx;
Wndy = Global.Config.HexEditorWndy; Wndy = Global.Config.HexEditorWndy;
Width = Global.Config.HexEditorWidth; Width_ = Global.Config.HexEditorWidth;
Height = Global.Config.HexEditorHeight; Height_ = Global.Config.HexEditorHeight;
BigEndian = Global.Config.HexEditorBigEndian; BigEndian = Global.Config.HexEditorBigEndian;
DataSize = Global.Config.HexEditorDataSize; DataSize = Global.Config.HexEditorDataSize;
} }
@ -86,8 +86,8 @@ namespace BizHawk.MultiClient
{ {
Global.Config.HexEditorWndx = loaded ? this.Location.X : Wndx; Global.Config.HexEditorWndx = loaded ? this.Location.X : Wndx;
Global.Config.HexEditorWndy = loaded ? this.Location.Y : Wndy; Global.Config.HexEditorWndy = loaded ? this.Location.Y : Wndy;
Global.Config.HexEditorWidth = loaded ? this.Right - this.Left : Width; Global.Config.HexEditorWidth = loaded ? this.Right - this.Left : Width_;
Global.Config.HexEditorHeight = loaded ? this.Bottom - this.Top : Height; Global.Config.HexEditorHeight = loaded ? this.Bottom - this.Top : Height_;
} }
Global.Config.HexEditorBigEndian = BigEndian; Global.Config.HexEditorBigEndian = BigEndian;
Global.Config.HexEditorDataSize = DataSize; Global.Config.HexEditorDataSize = DataSize;
@ -100,8 +100,8 @@ namespace BizHawk.MultiClient
if (Wndx >= 0 && Wndy >= 0) if (Wndx >= 0 && Wndy >= 0)
this.Location = new Point(Wndx, Wndy); this.Location = new Point(Wndx, Wndy);
if (Width >= 0 && Height >= 0) if (Width_ >= 0 && Height_ >= 0)
this.Size = new System.Drawing.Size(Width, Height); this.Size = new System.Drawing.Size(Width_, Height_);
} }
SetMemoryDomainMenu(); SetMemoryDomainMenu();
SetDataSize(DataSize); SetDataSize(DataSize);