diff --git a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs index 7fb213d5..45606c54 100644 --- a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs +++ b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.Designer.cs @@ -384,7 +384,7 @@ private void InitializeComponent() this.SectionButton_LaunchGame.SectionImage = global::Unify.Properties.Resources.Run_16x; this.SectionButton_LaunchGame.SectionText = "Launch Sonic \'06"; this.SectionButton_LaunchGame.SelectedSection = false; - this.SectionButton_LaunchGame.Size = new System.Drawing.Size(1506, 35); + this.SectionButton_LaunchGame.Size = new System.Drawing.Size(1509, 35); this.SectionButton_LaunchGame.TabIndex = 51; this.SectionButton_LaunchGame.TextColour = System.Drawing.SystemColors.Control; this.SectionButton_LaunchGame.Click += new System.EventHandler(this.SectionButton_LaunchGame_Click); @@ -570,7 +570,7 @@ private void InitializeComponent() this.SectionButton_RefreshMods.SectionImage = ((System.Drawing.Bitmap)(resources.GetObject("SectionButton_RefreshMods.SectionImage"))); this.SectionButton_RefreshMods.SectionText = "Refresh mods list"; this.SectionButton_RefreshMods.SelectedSection = false; - this.SectionButton_RefreshMods.Size = new System.Drawing.Size(2456, 35); + this.SectionButton_RefreshMods.Size = new System.Drawing.Size(2459, 35); this.SectionButton_RefreshMods.TabIndex = 52; this.SectionButton_RefreshMods.TextColour = System.Drawing.SystemColors.Control; this.SectionButton_RefreshMods.Click += new System.EventHandler(this.SectionButton_Refresh_Click); @@ -1295,7 +1295,7 @@ private void InitializeComponent() this.SectionButton_RefreshPatches.SectionImage = ((System.Drawing.Bitmap)(resources.GetObject("SectionButton_RefreshPatches.SectionImage"))); this.SectionButton_RefreshPatches.SectionText = "Refresh patches list"; this.SectionButton_RefreshPatches.SelectedSection = false; - this.SectionButton_RefreshPatches.Size = new System.Drawing.Size(1853, 35); + this.SectionButton_RefreshPatches.Size = new System.Drawing.Size(1856, 35); this.SectionButton_RefreshPatches.TabIndex = 52; this.SectionButton_RefreshPatches.TextColour = System.Drawing.SystemColors.Control; this.SectionButton_RefreshPatches.Click += new System.EventHandler(this.SectionButton_Refresh_Click); diff --git a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs index d07376cd..177bfd42 100644 --- a/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs +++ b/Sonic-06-Mod-Manager/src/Environment3/RushInterface.cs @@ -279,7 +279,8 @@ private void LoadSettings() #endregion #region Set controls depending on emulator - if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "Xenia") { + if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "Xenia") + { if (Properties.Settings.Default.Emulator_API != 2) // Enables most controls in the Emulator UI EnableEmulatorInterface(); @@ -289,15 +290,19 @@ private void LoadSettings() // Set visibility state of controls Label_RPCS3Warning.Visible = false; - } else if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "RPCS3") { + } + else if (Literal.Emulator(Properties.Settings.Default.Path_GameExecutable) == "RPCS3") + { // Disables most controls in the Emulator UI DisableEmulatorInterface(); - ComboBox_API.Enabled = false; + ComboBox_API.Enabled = ComboBox_Resolution.Enabled = false; Label_Subtitle_Emulator_Options.ForeColor = Label_API.ForeColor = Label_Description_API.ForeColor = + Label_Resolution.ForeColor = + Label_Description_Resolution.ForeColor = SystemColors.GrayText; // Set visibility state of controls @@ -320,30 +325,6 @@ private void LoadSettings() /// private void EnableEmulatorInterface() { #region Enable controls - if (Properties.Settings.Default.Tweak_Renderer == 0) { - // Set text colour to Control - Label_AntiAliasing.ForeColor = Label_Reflections.ForeColor = SystemColors.Control; - - // Set text colour to ControlDark - Label_Description_AntiAliasing.ForeColor = - Label_Description_Reflections.ForeColor = - SystemColors.ControlDark; - - // Set enabled state of controls - Button_AntiAliasing_Default.Enabled = - ComboBox_AntiAliasing.Enabled = - ComboBox_Reflections.Enabled = - Button_Reflections_Default.Enabled = - true; - - if (CheckBox_ForceMSAA.Enabled = Properties.Settings.Default.Tweak_AntiAliasing == 1) - // Set text colour to ControlDark - Label_Description_ForceMSAA.ForeColor = SystemColors.ControlDark; - else - // Set text colour to GrayText - Label_Description_ForceMSAA.ForeColor = SystemColors.GrayText; - } - if (Properties.Settings.Default.Emulator_API != 0) { ComboBox_Resolution.Enabled = false; Label_Description_Resolution.ForeColor = SystemColors.GrayText; @@ -388,30 +369,16 @@ private void EnableEmulatorInterface() { private void DisableEmulatorInterface() { #region Disable controls // Set text colour to GrayText - Label_Description_FieldOfView.ForeColor = - Label_Description_AntiAliasing.ForeColor = - Label_Description_ForceMSAA.ForeColor = - Label_Description_Reflections.ForeColor = Label_Description_UserLanguage.ForeColor = Label_Description_Resolution.ForeColor = Label_Description_VerticalSync.ForeColor = Label_Description_Gamma.ForeColor = Label_Description_Fullscreen.ForeColor = Label_Description_DiscordRPC.ForeColor = - Label_AntiAliasing.ForeColor = - Label_FieldOfView.ForeColor = - Label_Reflections.ForeColor = Label_UserLanguage.ForeColor = SystemColors.GrayText; // Set enabled state of controls - NumericUpDown_FieldOfView.Enabled = - Button_FieldOfView_Default.Enabled = - Button_AntiAliasing_Default.Enabled = - ComboBox_AntiAliasing.Enabled = - CheckBox_ForceMSAA.Enabled = - ComboBox_Reflections.Enabled = - Button_Reflections_Default.Enabled = ComboBox_UserLanguage.Enabled = CheckBox_Xenia_VerticalSync.Enabled = CheckBox_Xenia_Gamma.Enabled =