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

cleanup DisplayConfigLite

This commit is contained in:
adelikat 2019-12-16 18:39:59 -06:00
parent 5e8a2a348a
commit 8eff248d96
2 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/config/DisplayConfigLite.Designer.cs generated
View File

@ -940,7 +940,7 @@
this.trackbarFrameSizeWindowed.Size = new System.Drawing.Size(99, 42); this.trackbarFrameSizeWindowed.Size = new System.Drawing.Size(99, 42);
this.trackbarFrameSizeWindowed.TabIndex = 21; this.trackbarFrameSizeWindowed.TabIndex = 21;
this.trackbarFrameSizeWindowed.Value = 1; this.trackbarFrameSizeWindowed.Value = 1;
this.trackbarFrameSizeWindowed.ValueChanged += new System.EventHandler(this.trackbarFrameSizeWindowed_ValueChanged); this.trackbarFrameSizeWindowed.ValueChanged += new System.EventHandler(this.TrackBarFrameSizeWindowed_ValueChanged);
// //
// cbCaptionWindowed // cbCaptionWindowed
// //

35
BizHawk.Client.EmuHawk/config/DisplayConfigLite.cs
View File

@ -10,7 +10,7 @@ namespace BizHawk.Client.EmuHawk
{ {
public bool NeedReset; public bool NeedReset;
string PathSelection; string _pathSelection;
public DisplayConfigLite() public DisplayConfigLite()
{ {
@ -21,7 +21,7 @@ namespace BizHawk.Client.EmuHawk
rbScanlines.Checked = Global.Config.TargetDisplayFilter == 2; rbScanlines.Checked = Global.Config.TargetDisplayFilter == 2;
rbUser.Checked = Global.Config.TargetDisplayFilter == 3; rbUser.Checked = Global.Config.TargetDisplayFilter == 3;
PathSelection = Global.Config.DispUserFilterPath ?? ""; _pathSelection = Global.Config.DispUserFilterPath ?? "";
RefreshState(); RefreshState();
rbFinalFilterNone.Checked = Global.Config.DispFinalFilter == 0; rbFinalFilterNone.Checked = Global.Config.DispFinalFilter == 0;
@ -51,7 +51,7 @@ namespace BizHawk.Client.EmuHawk
cbMenuFullscreen.Checked = Global.Config.DispChrome_MenuFullscreen; cbMenuFullscreen.Checked = Global.Config.DispChrome_MenuFullscreen;
trackbarFrameSizeWindowed.Value = Global.Config.DispChrome_FrameWindowed; trackbarFrameSizeWindowed.Value = Global.Config.DispChrome_FrameWindowed;
cbFSAutohideMouse.Checked = Global.Config.DispChrome_Fullscreen_AutohideMouse; cbFSAutohideMouse.Checked = Global.Config.DispChrome_Fullscreen_AutohideMouse;
SyncTrackbar(); SyncTrackBar();
cbAllowDoubleclickFullscreen.Checked = Global.Config.DispChrome_AllowDoubleClickFullscreen; cbAllowDoubleclickFullscreen.Checked = Global.Config.DispChrome_AllowDoubleClickFullscreen;
@ -172,7 +172,7 @@ namespace BizHawk.Client.EmuHawk
if (oldDisplayMethod != Global.Config.DispMethod) if (oldDisplayMethod != Global.Config.DispMethod)
NeedReset = true; NeedReset = true;
Global.Config.DispUserFilterPath = PathSelection; Global.Config.DispUserFilterPath = _pathSelection;
GlobalWin.DisplayManager.RefreshUserShader(); GlobalWin.DisplayManager.RefreshUserShader();
DialogResult = DialogResult.OK; DialogResult = DialogResult.OK;
@ -181,14 +181,16 @@ namespace BizHawk.Client.EmuHawk
void RefreshState() void RefreshState()
{ {
lblUserFilterName.Text = Path.GetFileNameWithoutExtension(PathSelection); lblUserFilterName.Text = Path.GetFileNameWithoutExtension(_pathSelection);
} }
private void btnSelectUserFilter_Click(object sender, EventArgs e) private void btnSelectUserFilter_Click(object sender, EventArgs e)
{ {
using var ofd = new OpenFileDialog(); using var ofd = new OpenFileDialog
ofd.Filter = ".CGP (*.cgp)|*.cgp"; {
ofd.FileName = PathSelection; Filter = ".CGP (*.cgp)|*.cgp",
FileName = _pathSelection
};
if (ofd.ShowDialog() == DialogResult.OK) if (ofd.ShowDialog() == DialogResult.OK)
{ {
rbUser.Checked = true; rbUser.Checked = true;
@ -222,7 +224,7 @@ namespace BizHawk.Client.EmuHawk
} }
} }
PathSelection = choice; _pathSelection = choice;
RefreshState(); RefreshState();
} }
} }
@ -260,19 +262,27 @@ namespace BizHawk.Client.EmuHawk
lblScanlines.Text = $"{percentage:F2}%"; lblScanlines.Text = $"{percentage:F2}%";
} }
private void trackbarFrameSizeWindowed_ValueChanged(object sender, EventArgs e) private void TrackBarFrameSizeWindowed_ValueChanged(object sender, EventArgs e)
{ {
SyncTrackbar(); SyncTrackBar();
} }
void SyncTrackbar() void SyncTrackBar()
{ {
if (trackbarFrameSizeWindowed.Value == 0) if (trackbarFrameSizeWindowed.Value == 0)
{
lblFrameTypeWindowed.Text = "None"; lblFrameTypeWindowed.Text = "None";
}
if (trackbarFrameSizeWindowed.Value == 1) if (trackbarFrameSizeWindowed.Value == 1)
{
lblFrameTypeWindowed.Text = "Thin"; lblFrameTypeWindowed.Text = "Thin";
}
if (trackbarFrameSizeWindowed.Value == 2) if (trackbarFrameSizeWindowed.Value == 2)
{
lblFrameTypeWindowed.Text = "Thick"; lblFrameTypeWindowed.Text = "Thick";
}
} }
private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@ -294,6 +304,5 @@ namespace BizHawk.Client.EmuHawk
checkLetterbox.Checked = true; checkLetterbox.Checked = true;
rbUseSystem.Checked = true; rbUseSystem.Checked = true;
} }
} }
} }