Skip to content

Commit bcfe6fa

Browse files
committed
Fixed dumb conditions that don't make sense for tweaks
1 parent 6baf14c commit bcfe6fa

File tree

2 files changed

+11
-44
lines changed

2 files changed

+11
-44
lines changed

Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs

Lines changed: 8 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,8 @@ private void LoadSettings()
279279
#endregion
280280

281281
#region Set controls depending on emulator
282-
if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "Xenia") {
282+
if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "Xenia")
283+
{
283284
if (Properties.Settings.Default.Emulator_API != 2)
284285
// Enables most controls in the Emulator UI
285286
EnableEmulatorInterface();
@@ -289,15 +290,19 @@ private void LoadSettings()
289290

290291
// Set visibility state of controls
291292
Label_RPCS3Warning.Visible = false;
292-
} else if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "RPCS3") {
293+
}
294+
else if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "RPCS3")
295+
{
293296
// Disables most controls in the Emulator UI
294297
DisableEmulatorInterface();
295298

296-
ComboBox_API.Enabled = false;
299+
ComboBox_API.Enabled = ComboBox_Resolution.Enabled = false;
297300

298301
Label_Subtitle_Emulator_Options.ForeColor =
299302
Label_API.ForeColor =
300303
Label_Description_API.ForeColor =
304+
Label_Resolution.ForeColor =
305+
Label_Description_Resolution.ForeColor =
301306
SystemColors.GrayText;
302307

303308
// Set visibility state of controls
@@ -320,30 +325,6 @@ private void LoadSettings()
320325
/// </summary>
321326
private void EnableEmulatorInterface() {
322327
#region Enable controls
323-
if (Properties.Settings.Default.Tweak_Renderer == 0) {
324-
// Set text colour to Control
325-
Label_AntiAliasing.ForeColor = Label_Reflections.ForeColor = SystemColors.Control;
326-
327-
// Set text colour to ControlDark
328-
Label_Description_AntiAliasing.ForeColor =
329-
Label_Description_Reflections.ForeColor =
330-
SystemColors.ControlDark;
331-
332-
// Set enabled state of controls
333-
Button_AntiAliasing_Default.Enabled =
334-
ComboBox_AntiAliasing.Enabled =
335-
ComboBox_Reflections.Enabled =
336-
Button_Reflections_Default.Enabled =
337-
true;
338-
339-
if (CheckBox_ForceMSAA.Enabled = Properties.Settings.Default.Tweak_AntiAliasing == 1)
340-
// Set text colour to ControlDark
341-
Label_Description_ForceMSAA.ForeColor = SystemColors.ControlDark;
342-
else
343-
// Set text colour to GrayText
344-
Label_Description_ForceMSAA.ForeColor = SystemColors.GrayText;
345-
}
346-
347328
if (Properties.Settings.Default.Emulator_API != 0) {
348329
ComboBox_Resolution.Enabled = false;
349330
Label_Description_Resolution.ForeColor = SystemColors.GrayText;
@@ -388,30 +369,16 @@ private void EnableEmulatorInterface() {
388369
private void DisableEmulatorInterface() {
389370
#region Disable controls
390371
// Set text colour to GrayText
391-
Label_Description_FieldOfView.ForeColor =
392-
Label_Description_AntiAliasing.ForeColor =
393-
Label_Description_ForceMSAA.ForeColor =
394-
Label_Description_Reflections.ForeColor =
395372
Label_Description_UserLanguage.ForeColor =
396373
Label_Description_Resolution.ForeColor =
397374
Label_Description_VerticalSync.ForeColor =
398375
Label_Description_Gamma.ForeColor =
399376
Label_Description_Fullscreen.ForeColor =
400377
Label_Description_DiscordRPC.ForeColor =
401-
Label_AntiAliasing.ForeColor =
402-
Label_FieldOfView.ForeColor =
403-
Label_Reflections.ForeColor =
404378
Label_UserLanguage.ForeColor =
405379
SystemColors.GrayText;
406380

407381
// Set enabled state of controls
408-
NumericUpDown_FieldOfView.Enabled =
409-
Button_FieldOfView_Default.Enabled =
410-
Button_AntiAliasing_Default.Enabled =
411-
ComboBox_AntiAliasing.Enabled =
412-
CheckBox_ForceMSAA.Enabled =
413-
ComboBox_Reflections.Enabled =
414-
Button_Reflections_Default.Enabled =
415382
ComboBox_UserLanguage.Enabled =
416383
CheckBox_Xenia_VerticalSync.Enabled =
417384
CheckBox_Xenia_Gamma.Enabled =

0 commit comments

Comments
 (0)