made blend effect togglable in options

maxijabase · maxijabase · commit 73142fdbf45a · 2022-11-06T13:24:10.000-03:00
diff --git a/Interop/OptionsControl.cs b/Interop/OptionsControl.cs
@@ -11,7 +11,8 @@ namespace SPCode
     [Serializable]
     public class OptionsControl
     {
-        public static int SVersion = 15;
+        public static int SVersion = 16;
+
         public bool Editor_AgressiveIndentation = true;
         public bool Editor_AutoCloseBrackets = true;
         public bool Editor_AutoCloseStringChars = true;
@@ -90,6 +91,9 @@ public class OptionsControl
         // Version 15
         public int TranslationsVersion;
 
+        // Version 16
+        public bool Editor_UseBlendEffect;
+
         public int Version = 11;
 
         public void FillNullToDefaults()
@@ -181,6 +185,10 @@ public void FillNullToDefaults()
                 {
                     TranslationsVersion = 0;
                 }
+                if (Version < 15)
+                {
+                    Editor_UseBlendEffect = true;
+                }
 
                 //new Optionsversion - reset new fields to default
                 Version = SVersion; //then Update Version afterwards
diff --git a/UI/Components/EditorElement/EditorElementGoToDefinition.cs b/UI/Components/EditorElement/EditorElementGoToDefinition.cs
@@ -45,7 +45,7 @@ private async Task GoToDefinition(MouseButtonEventArgs e)
                         }
 
                         await Task.Delay(100);
-                        if (Program.MainWindow.TryLoadSourceFile(file, out var newEditor, true, false, true) && newEditor != null)
+                        if (Program.MainWindow.TryLoadSourceFile(file, out var newEditor, false, true) && newEditor != null)
                         {
                             newEditor.editor.TextArea.Caret.Offset = sm.Index;
                             newEditor.editor.TextArea.Caret.BringCaretToView();
diff --git a/UI/MainWindow/MainWindow.xaml.cs b/UI/MainWindow/MainWindow.xaml.cs
@@ -159,7 +159,7 @@ public MainWindow(SplashScreen sc)
             {
                 if (!args[i].EndsWith("exe"))
                 {
-                    TryLoadSourceFile(args[i], out _, false, true, i == 0);
+                    TryLoadSourceFile(args[i], out _, true, i == 0);
                 }
                 if (args[i].ToLowerInvariant() == "--updateok")
                 {
@@ -315,7 +315,7 @@ private void MetroWindow_Drop(object sender, DragEventArgs e)
                 Debug.Assert(files != null, nameof(files) + " != null");
                 for (var i = 0; i < files.Length; ++i)
                 {
-                    TryLoadSourceFile(files[i], out _, i == 0, true, i == 0);
+                    TryLoadSourceFile(files[i], out _, true, i == 0);
                 }
             }
         }
@@ -340,7 +340,7 @@ private void EditorObjectBrowserGridRow_WidthChanged(object sender, EventArgs e)
         /// <param name="TryOpenIncludes">Whether to open the includes associated with that file</param>
         /// <param name="SelectMe">Whether to focus the editor element once the file gets opened</param>
         /// <returns>If the file opening was successful or not</returns>
-        public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool UseBlendoverEffect = true, bool TryOpenIncludes = true, bool SelectMe = false)
+        public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool TryOpenIncludes = true, bool SelectMe = false)
         {
             outEditor = null;
             var fileInfo = new FileInfo(filePath);
@@ -430,10 +430,7 @@ public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool
                 return false;
             }
 
-            if (UseBlendoverEffect)
-            {
-                BlendOverEffect.Begin();
-            }
+            BlendEffect();
 
             return true;
         }
@@ -584,6 +581,17 @@ private void CloseProgram(bool saveAll)
             }
         }
 
+        /// <summary>
+        /// Begin blend effect if enabled
+        /// </summary>
+        private void BlendEffect()
+        {
+            if (Program.OptionsObject.Editor_UseBlendEffect)
+            {
+                BlendOverEffect.Begin();
+            }
+        }
+
         public void DimmMainWindow()
         {
             BlendEffectPlane.Fill = new SolidColorBrush(Colors.Black);
diff --git a/UI/MainWindow/MainWindowCommands.cs b/UI/MainWindow/MainWindowCommands.cs
@@ -157,7 +157,7 @@ private void Command_Open()
                     {
                         for (var i = 0; i < ofd.FileNames.Length; ++i)
                         {
-                            AnyFileLoaded |= TryLoadSourceFile(ofd.FileNames[i], out _, i == 0, true, i == 0);
+                            AnyFileLoaded |= TryLoadSourceFile(ofd.FileNames[i], out _, true, i == 0);
                         }
 
                         if (!AnyFileLoaded)
@@ -189,7 +189,7 @@ private void Command_Save()
                 if (ee != null && !ee.IsTemplateEditor)
                 {
                     ee.Save(true);
-                    BlendOverEffect.Begin();
+                    BlendEffect();
                 }
             }
             catch (Exception ex)
@@ -214,7 +214,7 @@ private void Command_SaveAs()
                     {
                         ee.FullFilePath = sfd.FileName;
                         ee.Save(true);
-                        BlendOverEffect.Begin();
+                        BlendEffect();
                     }
                 }
             }
@@ -304,7 +304,7 @@ private void Command_SaveAll()
         {
             try
             {
-                if (!EditorReferences.Any()|| GetCurrentEditorElement().IsTemplateEditor)
+                if (!EditorReferences.Any() || GetCurrentEditorElement().IsTemplateEditor)
                 {
                     return;
                 }
@@ -316,7 +316,7 @@ private void Command_SaveAll()
                         editor.Save();
                     }
 
-                    BlendOverEffect.Begin();
+                    BlendEffect();
                 }
             }
             catch (Exception ex)
@@ -642,7 +642,7 @@ private void Command_ReopenLastClosedTab()
             {
                 if (Program.RecentFilesStack.Count > 0)
                 {
-                    TryLoadSourceFile(Program.RecentFilesStack.Pop(), out _, true, false, true);
+                    TryLoadSourceFile(Program.RecentFilesStack.Pop(), out _, false, true);
                 }
 
                 MenuI_ReopenLastClosedTab.IsEnabled = Program.RecentFilesStack.Count > 0;
diff --git a/UI/MainWindow/MainWindowErrorResultGrid.cs b/UI/MainWindow/MainWindowErrorResultGrid.cs
@@ -70,7 +70,7 @@ private async void ErrorResultGrid_SelectionChanged(object sender, SelectionChan
                 }
 
                 // If it's not opened, open it and go to the error line
-                if (TryLoadSourceFile(fInfo.FullName, out var editor, true, false, true) && editor != null)
+                if (TryLoadSourceFile(fInfo.FullName, out var editor, false, true) && editor != null)
                 {
                     await Task.Delay(50);
                     GoToErrorLine(editor, row);
diff --git a/UI/MainWindow/MainWindowMenuHandler.cs b/UI/MainWindow/MainWindowMenuHandler.cs
@@ -454,7 +454,7 @@ private MenuItem BuildRecentFileItem(string file)
             // Set the click callback to open the file
             mi.Click += delegate
             {
-                TryLoadSourceFile(fInfo.FullName, out _, true, false, true);
+                TryLoadSourceFile(fInfo.FullName, out _, false, true);
             };
 
             // Return the MenuItem
diff --git a/UI/MainWindow/MainWindowObjectBrowser.cs b/UI/MainWindow/MainWindowObjectBrowser.cs
@@ -102,7 +102,7 @@ private void TreeViewOBItemFile_DoubleClicked(object sender, MouseButtonEventArg
             var itemInfo = (ObjectBrowserTag)item.Tag;
             if (itemInfo.Kind == ObjectBrowserItemKind.File)
             {
-                TryLoadSourceFile(itemInfo.Value, out _, true, false, true);
+                TryLoadSourceFile(itemInfo.Value, out _, false, true);
             }
         }
 
diff --git a/UI/Windows/NewFileWindow.xaml.cs b/UI/Windows/NewFileWindow.xaml.cs
@@ -380,7 +380,7 @@ private void GoToSelectedTemplate()
                 if ((TemplateListBox.SelectedItem as ListBoxItem)?.Tag is TemplateInfo templateInfo)
                 {
                     File.Copy(templateInfo.Path, destFile.FullName, true);
-                    Program.MainWindow.TryLoadSourceFile(destFile.FullName, out _, true, true, true);
+                    Program.MainWindow.TryLoadSourceFile(destFile.FullName, out _, true, true);
                 }
 
                 Close();
diff --git a/UI/Windows/OptionsWindow.xaml b/UI/Windows/OptionsWindow.xaml
@@ -105,6 +105,7 @@
               <CheckBox Name="DynamicISAC" Checked="DynamicISAC_Changed" Unchecked="DynamicISAC_Changed" />
               <CheckBox Name="DarkTheme" Checked="DarkTheme_Changed" Unchecked="DarkTheme_Changed" />
               <CheckBox Name="HardwareSalts" Checked="HardwareSalts_Changed" Unchecked="HardwareSalts_Changed" />
+              <CheckBox Name="UseBlendEffect" Checked="UseBlendEffect_Changed" Unchecked="UseBlendEffect_Changed" />
               <CheckBox Name="DiscordPresence" Checked="DiscordPresence_Changed" Unchecked="DiscordPresence_Changed" />
               <CheckBox Name="DiscordPresenceTime" Style="{StaticResource IndentedCheckBox}" Checked="DiscordPresenceTime_Changed" Unchecked="DiscordPresenceTime_Changed" />
               <CheckBox Name="DiscordPresenceFile" Style="{StaticResource IndentedCheckBox}" Checked="DiscordPresenceFile_Changed" Unchecked="DiscordPresenceFile_Changed" />
diff --git a/UI/Windows/OptionsWindow.xaml.cs b/UI/Windows/OptionsWindow.xaml.cs
@@ -434,6 +434,16 @@ private void HardwareSalts_Changed(object sender, RoutedEventArgs e)
             Program.MakeRCCKAlert();
         }
 
+        private void UseBlendEffect_Changed(object sender, RoutedEventArgs e)
+        {
+            if (!AllowChanging)
+            {
+                return;
+            }
+
+            Program.OptionsObject.Editor_UseBlendEffect = UseBlendEffect.IsChecked.Value;
+        }
+
         private void DiscordPresence_Changed(object sender, RoutedEventArgs e)
         {
             if (!AllowChanging)
@@ -664,6 +674,7 @@ private void LoadSettings()
             FontFamilyCB.SelectedValue = new FontFamily(Program.OptionsObject.Editor_FontFamily);
             IndentationSize.Value = Program.OptionsObject.Editor_IndentationSize;
             HardwareSalts.IsChecked = Program.OptionsObject.Program_UseHardwareSalts;
+            UseBlendEffect.IsChecked = Program.OptionsObject.Editor_UseBlendEffect;
             DiscordPresence.IsChecked = Program.OptionsObject.Program_DiscordPresence;
             DiscordPresenceTime.IsChecked = Program.OptionsObject.Program_DiscordPresenceTime;
             DiscordPresenceFile.IsChecked = Program.OptionsObject.Program_DiscordPresenceFile;
@@ -690,6 +701,7 @@ private void Language_Translate()
         {
             Title = Translate("Options");
             HardwareSalts.Content = Translate("HardwareEncryption");
+            UseBlendEffect.Content = Translate("UseBlendEffect");
             ProgramHeader.Header = Translate("Program");
             HardwareAcc.Content = Translate("HardwareAcc");
             UIAnimation.Content = Translate("UIAnim");
diff --git a/UI/Windows/SPDefinitionWindow.xaml.cs b/UI/Windows/SPDefinitionWindow.xaml.cs
@@ -287,7 +287,7 @@ private void GoToDefinition()
 
             foreach (var cfg in config)
             {
-                if (Program.MainWindow.TryLoadSourceFile(Path.GetFullPath(Path.Combine(cfg, "include", sm.File)) + ".inc", out var ee, true, false, true) && ee != null)
+                if (Program.MainWindow.TryLoadSourceFile(Path.GetFullPath(Path.Combine(cfg, "include", sm.File)) + ".inc", out var ee, false, true) && ee != null)
                 {
                     ee.editor.TextArea.Caret.Offset = sm.Index;
                     ee.editor.TextArea.Caret.BringCaretToView();

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ private async Task GoToDefinition(MouseButtonEventArgs e)`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`await Task.Delay(100);`
`48`		`- if (Program.MainWindow.TryLoadSourceFile(file, out var newEditor, true, false, true) && newEditor != null)`
	`48`	`+ if (Program.MainWindow.TryLoadSourceFile(file, out var newEditor, false, true) && newEditor != null)`
`49`	`49`	`{`
`50`	`50`	`newEditor.editor.TextArea.Caret.Offset = sm.Index;`
`51`	`51`	`newEditor.editor.TextArea.Caret.BringCaretToView();`
Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ public MainWindow(SplashScreen sc)`
`159`	`159`	`{`
`160`	`160`	`if (!args[i].EndsWith("exe"))`
`161`	`161`	`{`
`162`		`- TryLoadSourceFile(args[i], out _, false, true, i == 0);`
	`162`	`+ TryLoadSourceFile(args[i], out _, true, i == 0);`
`163`	`163`	`}`
`164`	`164`	`if (args[i].ToLowerInvariant() == "--updateok")`
`165`	`165`	`{`
`@@ -315,7 +315,7 @@ private void MetroWindow_Drop(object sender, DragEventArgs e)`
`315`	`315`	`Debug.Assert(files != null, nameof(files) + " != null");`
`316`	`316`	`for (var i = 0; i < files.Length; ++i)`
`317`	`317`	`{`
`318`		`- TryLoadSourceFile(files[i], out _, i == 0, true, i == 0);`
	`318`	`+ TryLoadSourceFile(files[i], out _, true, i == 0);`
`319`	`319`	`}`
`320`	`320`	`}`
`321`	`321`	`}`
`@@ -340,7 +340,7 @@ private void EditorObjectBrowserGridRow_WidthChanged(object sender, EventArgs e)`
`340`	`340`	`/// <param name="TryOpenIncludes">Whether to open the includes associated with that file</param>`
`341`	`341`	`/// <param name="SelectMe">Whether to focus the editor element once the file gets opened</param>`
`342`	`342`	`/// <returns>If the file opening was successful or not</returns>`
`343`		`- public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool UseBlendoverEffect = true, bool TryOpenIncludes = true, bool SelectMe = false)`
	`343`	`+ public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool TryOpenIncludes = true, bool SelectMe = false)`
`344`	`344`	`{`
`345`	`345`	`outEditor = null;`
`346`	`346`	`var fileInfo = new FileInfo(filePath);`
`@@ -430,10 +430,7 @@ public bool TryLoadSourceFile(string filePath, out EditorElement outEditor, bool`
`430`	`430`	`return false;`
`431`	`431`	`}`
`432`	`432`
`433`		`- if (UseBlendoverEffect)`
`434`		`- {`
`435`		`- BlendOverEffect.Begin();`
`436`		`- }`
	`433`	`+ BlendEffect();`
`437`	`434`
`438`	`435`	`return true;`
`439`	`436`	`}`
`@@ -584,6 +581,17 @@ private void CloseProgram(bool saveAll)`
`584`	`581`	`}`
`585`	`582`	`}`
`586`	`583`
	`584`	`+ /// <summary>`
	`585`	`+ /// Begin blend effect if enabled`
	`586`	`+ /// </summary>`
	`587`	`+ private void BlendEffect()`
	`588`	`+ {`
	`589`	`+ if (Program.OptionsObject.Editor_UseBlendEffect)`
	`590`	`+ {`
	`591`	`+ BlendOverEffect.Begin();`
	`592`	`+ }`
	`593`	`+ }`
	`594`	`+`
`587`	`595`	`public void DimmMainWindow()`
`588`	`596`	`{`
`589`	`597`	`BlendEffectPlane.Fill = new SolidColorBrush(Colors.Black);`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ private void Command_Open()`
`157`	`157`	`{`
`158`	`158`	`for (var i = 0; i < ofd.FileNames.Length; ++i)`
`159`	`159`	`{`
`160`		`- AnyFileLoaded \|= TryLoadSourceFile(ofd.FileNames[i], out _, i == 0, true, i == 0);`
	`160`	`+ AnyFileLoaded \|= TryLoadSourceFile(ofd.FileNames[i], out _, true, i == 0);`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`if (!AnyFileLoaded)`
`@@ -189,7 +189,7 @@ private void Command_Save()`
`189`	`189`	`if (ee != null && !ee.IsTemplateEditor)`
`190`	`190`	`{`
`191`	`191`	`ee.Save(true);`
`192`		`- BlendOverEffect.Begin();`
	`192`	`+ BlendEffect();`
`193`	`193`	`}`
`194`	`194`	`}`
`195`	`195`	`catch (Exception ex)`
`@@ -214,7 +214,7 @@ private void Command_SaveAs()`
`214`	`214`	`{`
`215`	`215`	`ee.FullFilePath = sfd.FileName;`
`216`	`216`	`ee.Save(true);`
`217`		`- BlendOverEffect.Begin();`
	`217`	`+ BlendEffect();`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`}`
`@@ -304,7 +304,7 @@ private void Command_SaveAll()`
`304`	`304`	`{`
`305`	`305`	`try`
`306`	`306`	`{`
`307`		`- if (!EditorReferences.Any()\|\| GetCurrentEditorElement().IsTemplateEditor)`
	`307`	`+ if (!EditorReferences.Any() \|\| GetCurrentEditorElement().IsTemplateEditor)`
`308`	`308`	`{`
`309`	`309`	`return;`
`310`	`310`	`}`
`@@ -316,7 +316,7 @@ private void Command_SaveAll()`
`316`	`316`	`editor.Save();`
`317`	`317`	`}`
`318`	`318`
`319`		`- BlendOverEffect.Begin();`
	`319`	`+ BlendEffect();`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`	`catch (Exception ex)`
`@@ -642,7 +642,7 @@ private void Command_ReopenLastClosedTab()`
`642`	`642`	`{`
`643`	`643`	`if (Program.RecentFilesStack.Count > 0)`
`644`	`644`	`{`
`645`		`- TryLoadSourceFile(Program.RecentFilesStack.Pop(), out _, true, false, true);`
	`645`	`+ TryLoadSourceFile(Program.RecentFilesStack.Pop(), out _, false, true);`
`646`	`646`	`}`
`647`	`647`
`648`	`648`	`MenuI_ReopenLastClosedTab.IsEnabled = Program.RecentFilesStack.Count > 0;`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private async void ErrorResultGrid_SelectionChanged(object sender, SelectionChan`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`// If it's not opened, open it and go to the error line`
`73`		`- if (TryLoadSourceFile(fInfo.FullName, out var editor, true, false, true) && editor != null)`
	`73`	`+ if (TryLoadSourceFile(fInfo.FullName, out var editor, false, true) && editor != null)`
`74`	`74`	`{`
`75`	`75`	`await Task.Delay(50);`
`76`	`76`	`GoToErrorLine(editor, row);`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,7 @@ private MenuItem BuildRecentFileItem(string file)`
`454`	`454`	`// Set the click callback to open the file`
`455`	`455`	`mi.Click += delegate`
`456`	`456`	`{`
`457`		`- TryLoadSourceFile(fInfo.FullName, out _, true, false, true);`
	`457`	`+ TryLoadSourceFile(fInfo.FullName, out _, false, true);`
`458`	`458`	`};`
`459`	`459`
`460`	`460`	`// Return the MenuItem`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private void TreeViewOBItemFile_DoubleClicked(object sender, MouseButtonEventArg`
`102`	`102`	`var itemInfo = (ObjectBrowserTag)item.Tag;`
`103`	`103`	`if (itemInfo.Kind == ObjectBrowserItemKind.File)`
`104`	`104`	`{`
`105`		`- TryLoadSourceFile(itemInfo.Value, out _, true, false, true);`
	`105`	`+ TryLoadSourceFile(itemInfo.Value, out _, false, true);`
`106`	`106`	`}`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -380,7 +380,7 @@ private void GoToSelectedTemplate()`
`380`	`380`	`if ((TemplateListBox.SelectedItem as ListBoxItem)?.Tag is TemplateInfo templateInfo)`
`381`	`381`	`{`
`382`	`382`	`File.Copy(templateInfo.Path, destFile.FullName, true);`
`383`		`- Program.MainWindow.TryLoadSourceFile(destFile.FullName, out _, true, true, true);`
	`383`	`+ Program.MainWindow.TryLoadSourceFile(destFile.FullName, out _, true, true);`
`384`	`384`	`}`
`385`	`385`
`386`	`386`	`Close();`