Reverted most changes

Author: Lehonti Ramos

.build/Build.cs

@@ -52,16 +52,16 @@ protected override void OnBuildInitialized()
     string AssemblySemFileVer => GitVersion?.AssemblySemFileVer ?? "1.0.0";
 
     // Define directories.
-    static AbsolutePath FluentRibbonDirectory => RootDirectory / "Fluent.Ribbon";
+    AbsolutePath FluentRibbonDirectory => RootDirectory / "Fluent.Ribbon";
 
-    static AbsolutePath BuildBinDirectory => RootDirectory / "bin";
+    AbsolutePath BuildBinDirectory => RootDirectory / "bin";
 
-    static AbsolutePath ReferenceDataDir => RootDirectory / "ReferenceData";
+    AbsolutePath ReferenceDataDir => RootDirectory / "ReferenceData";
 
     [Parameter]
     readonly AbsolutePath ArtifactsDirectory = RootDirectory / "artifacts";
 
-    static AbsolutePath TestResultsDir => RootDirectory / "TestResults";
+    AbsolutePath TestResultsDir => RootDirectory / "TestResults";
 
     Target CleanOutput => _ => _
         .Executes(() =>

.build/ResourceKeys.cs

@@ -58,7 +58,7 @@ public ResourceKeys(params string[] sourceFiles)
         }
     }
 
-    static string BuildExpectedKey(string requiredPrefix, string key)
+    string BuildExpectedKey(string requiredPrefix, string key)
     {
         return requiredPrefix + BuildKey(key).Replace("Fluent.Ribbon.", string.Empty);
 

Fluent.Ribbon.Showcase/ViewModels/IssueRepros/ThemeManagerFromThread.cs

@@ -30,7 +30,7 @@ public ThemeManagerFromThread()
 
     public RelayCommand StartStopCommand { get; set; }
 
-    private static void Info(string info)
+    private void Info(string info)
     {
         Trace.WriteLine($@"{DateTime.Now} {info}");
     }
@@ -71,7 +71,7 @@ private void ThreadProc()
 
         var newTheme = (ThemeColors)this.currentTheme;
 
-        ThemeManagerFromThread.Info("Changing theme to " + newTheme);
+        this.Info("Changing theme to " + newTheme);
         this.ChangeTheme(newTheme);
 
         this.currentTheme++;
@@ -90,11 +90,11 @@ private void ChangeTheme(ThemeColors themeColor)
             {
                 ThemeManager.Current.ChangeTheme(Application.Current, newTheme);
 
-                ThemeManagerFromThread.Info($"Change theme: NewTheme: {newTheme.Name} Theme changed.");
+                this.Info($"Change theme: NewTheme: {newTheme.Name} Theme changed.");
             }
             else
             {
-                ThemeManagerFromThread.Info($"Change theme: Theme not found: {themeColor}.");
+                this.Info($"Change theme: Theme not found: {themeColor}.");
             }
         }
     }
@@ -104,12 +104,12 @@ private void ThemeManagerThemeChangedHandler(object sender, ThemeChangedEventArg
         try
         {
             var theme = ThemeManager.Current.DetectTheme(Application.Current);
-            ThemeManagerFromThread.Info($"Current theme from args: {e.NewTheme.Name}");
-            ThemeManagerFromThread.Info($"Current theme from detection: {theme.Name}");
+            this.Info($"Current theme from args: {e.NewTheme.Name}");
+            this.Info($"Current theme from detection: {theme.Name}");
         }
         catch (Exception ex)
         {
-            ThemeManagerFromThread.Info(ex.Message);
+            this.Info(ex.Message);
         }
     }
 }

Fluent.Ribbon/Controls/RibbonGroupBoxWrapPanel.cs

@@ -199,7 +199,7 @@ internal UvSize(Orientation orientation)
 
         internal double U;
         internal double V;
-        private readonly Orientation orientation;
+        private Orientation orientation;
 
         internal double Width
         {

Fluent.Ribbon/Effects/GrayscaleEffect.cs

@@ -27,13 +27,13 @@ public class GrayscaleEffect : ShaderEffect
     /// </summary>
     public GrayscaleEffect()
     {
-        this.PixelShader = GrayscaleEffect.CreatePixelShader();
+        this.PixelShader = this.CreatePixelShader();
 
         this.UpdateShaderValue(InputProperty);
         this.UpdateShaderValue(FilterColorProperty);
     }
 
-    private static PixelShader CreatePixelShader()
+    private PixelShader CreatePixelShader()
     {
         var pixelShader = new PixelShader { UriSource = new Uri("pack://application:,,,/Fluent;component/Themes/Effects/Grayscale.ps", UriKind.RelativeOrAbsolute) };
 

Fluent.Ribbon/Services/KeyTipService.cs

@@ -415,7 +415,7 @@ private void ClearUserInput()
         this.currentUserInput = string.Empty;
     }
 
-    private static void ClosePopups()
+    private void ClosePopups()
     {
         PopupService.RaiseDismissPopupEvent(Keyboard.FocusedElement, DismissPopupMode.Always, DismissPopupReason.ShowingKeyTips);
     }
@@ -438,7 +438,7 @@ private void OnAdornerChainTerminated(object? sender, KeyTipPressedResult e)
 
         if (e.PressedElementOpenedPopup == false)
         {
-            KeyTipService.ClosePopups();
+            this.ClosePopups();
         }
 
         if (e.PressedElementAquiredFocus == false)
@@ -500,7 +500,7 @@ private void Show()
             return;
         }
 
-        KeyTipService.ClosePopups();
+        this.ClosePopups();
 
         this.backUpFocusedControl = null;