tidied up things uwu

Author: torchgm

.editorconfig

@@ -0,0 +1,4 @@
+[*.{cs,vb}]
+
+# IDE0044: Add readonly modifier
+dotnet_style_readonly_field = true:silent

ActiveDesktop.sln

@@ -5,6 +5,11 @@ VisualStudioVersion = 16.0.29230.47
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ActiveDesktop", "ActiveDesktop\ActiveDesktop.csproj", "{B51E0A72-E7FD-4CD3-AF12-9D78703574E1}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F4FC857A-57C6-40EC-8DFF-9289E0A15432}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

ActiveDesktop/ADPVideoWallpaper.xaml.cs

@@ -65,13 +65,13 @@ private void worker_DoWork(object sender, DoWorkEventArgs e)
                         MainWindow.DwmGetWindowAttribute(wnd, Convert.ToInt32(DwmApi.DWMWINDOWATTRIBUTE.DWMWA_CLOAKED), out cloaked, Marshal.SizeOf(typeof(bool)));
                         if (MainWindow.IsZoomed(wnd) && MainWindow.IsWindowVisible(wnd) && cloaked <= 0)
                         {
-                            MainWindow.RECT WindowRect;
-                            MainWindow.RECT VideoPlayerRect;
-                            MainWindow.GetWindowRect(wnd, out WindowRect);
-                            MainWindow.GetWindowRect(VideoPlayerHandle, out VideoPlayerRect);
-                            MainWindow.POINT Corner = new MainWindow.POINT();
-                            Corner.X = VideoPlayerRect.Left + 10;
-                            Corner.Y = VideoPlayerRect.Top + 10;
+                            MainWindow.GetWindowRect(wnd, out MainWindow.RECT WindowRect);
+                            MainWindow.GetWindowRect(VideoPlayerHandle, out MainWindow.RECT VideoPlayerRect);
+                            MainWindow.POINT Corner = new MainWindow.POINT
+                            {
+                                X = VideoPlayerRect.Left + 10,
+                                Y = VideoPlayerRect.Top + 10
+                            };
                             if (MainWindow.PtInRect(in WindowRect, Corner) && PauseOnMax)
                             {
                                 Dispatcher.Invoke(() =>

ActiveDesktop/ActiveDesktop.csproj

@@ -177,6 +177,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="..\.editorconfig">
+      <Link>.editorconfig</Link>
+    </None>
     <None Include="app.manifest" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">

ActiveDesktop/MainWindow.xaml.cs

@@ -253,19 +253,21 @@ public void AddButton_Click(object sender, RoutedEventArgs e)
         {
             if (SavedAppsPage.CmdBox.Text != "Command Line")
             {
-                App AppToAdd = new App();
-                AppToAdd.Cmd = SavedAppsPage.CmdBox.Text;
-                AppToAdd.Xpos = SavedAppsPage.XBox.Text;
-                AppToAdd.Ypos = SavedAppsPage.YBox.Text;
-                AppToAdd.Width = SavedAppsPage.WidthBox.Text;
-                AppToAdd.Height = SavedAppsPage.HeightBox.Text;
-                AppToAdd.Flags = SavedAppsPage.FlagBox.Text;
-                AppToAdd.Name = SavedAppsPage.NameBox.Text;
-                AppToAdd.Time = SavedAppsPage.TimeBox.Text;
-                AppToAdd.Lock = SavedAppsPage.LockedCheckBox.IsChecked ?? false;
-                AppToAdd.Startup = SavedAppsPage.AutostartCheckBox.IsChecked ?? false;
-                AppToAdd.Fix = SavedAppsPage.FixCheckBox.IsChecked ?? false;
-                AppToAdd.Pin = SavedAppsPage.PinnedCheckBox.IsChecked ?? false;
+                App AppToAdd = new App
+                {
+                    Cmd = SavedAppsPage.CmdBox.Text,
+                    Xpos = SavedAppsPage.XBox.Text,
+                    Ypos = SavedAppsPage.YBox.Text,
+                    Width = SavedAppsPage.WidthBox.Text,
+                    Height = SavedAppsPage.HeightBox.Text,
+                    Flags = SavedAppsPage.FlagBox.Text,
+                    Name = SavedAppsPage.NameBox.Text,
+                    Time = SavedAppsPage.TimeBox.Text,
+                    Lock = SavedAppsPage.LockedCheckBox.IsChecked ?? false,
+                    Startup = SavedAppsPage.AutostartCheckBox.IsChecked ?? false,
+                    Fix = SavedAppsPage.FixCheckBox.IsChecked ?? false,
+                    Pin = SavedAppsPage.PinnedCheckBox.IsChecked ?? false
+                };
                 JSONArrayList.Add(AppToAdd);
 
 
@@ -363,15 +365,13 @@ public void SaveButton_Click(object sender, RoutedEventArgs e)
         {
             if (CurrentAppsPage.HandleListBox.SelectedIndex != -1)
             {
-                RECT PosTarget;
-                uint PID;
                 string SyllyIsAwesome;
                 IntPtr hwnd = IntPtr.Zero;
                 hwnd = new IntPtr(Convert.ToInt32(DesktopWindowPropertyList[Convert.ToInt32(CurrentAppsPage.HandleListBox.SelectedItem.ToString().Substring(CurrentAppsPage.HandleListBox.SelectedItem.ToString().Length - 3))][2]));
                 StringBuilder WindowTitle = new StringBuilder(1000);
                 StringBuilder FileName = new StringBuilder(1000);
                 uint size = (uint)FileName.Capacity;
-                GetWindowThreadProcessId(hwnd, out PID);
+                GetWindowThreadProcessId(hwnd, out uint PID);
                 IntPtr handle = OpenProcess(0x1000, false, PID);
                 if (QueryFullProcessImageNameW(handle, 0, FileName, ref size) != 0)
                 {
@@ -383,7 +383,7 @@ public void SaveButton_Click(object sender, RoutedEventArgs e)
                 }
                 CloseHandle(handle);
 
-                GetWindowRect(hwnd, out PosTarget);
+                GetWindowRect(hwnd, out RECT PosTarget);
                 GetWindowText(hwnd, WindowTitle, 1000);
                 SavedAppsPage.CmdBox.Text = SyllyIsAwesome;
                 SavedAppsPage.XBox.Text = PosTarget.Left.ToString();
@@ -580,8 +580,7 @@ private void NavView_ItemInvoked(NavigationView sender, NavigationViewItemInvoke
                 }
                 else
                 {
-                    TextBlock ItemContent = args.InvokedItem as TextBlock;
-                    if (ItemContent != null)
+                    if (args.InvokedItem is TextBlock ItemContent)
                     {
                         switch (ItemContent.Tag)
                         {
@@ -758,15 +757,17 @@ public DisplayInfoCollection GetDisplays()
                     bool success = GetMonitorInfo(hMonitor, ref mi);
                     if (success)
                     {
-                        DisplayInfo di = new DisplayInfo();
-                        di.ScreenWidth = (mi.rcMonitor.Right - mi.rcMonitor.Left).ToString();
-                        di.ScreenHeight = (mi.rcMonitor.Bottom - mi.rcMonitor.Top).ToString();
-                        di.MonitorArea = mi.rcMonitor;
-                        di.WorkArea = mi.rcWork;
-                        di.Availability = mi.dwFlags.ToString();
-                        di.Handle = hMonitor;
-                        di.Top = mi.rcMonitor.Top;
-                        di.Left = mi.rcMonitor.Left;
+                        DisplayInfo di = new DisplayInfo
+                        {
+                            ScreenWidth = (mi.rcMonitor.Right - mi.rcMonitor.Left).ToString(),
+                            ScreenHeight = (mi.rcMonitor.Bottom - mi.rcMonitor.Top).ToString(),
+                            MonitorArea = mi.rcMonitor,
+                            WorkArea = mi.rcWork,
+                            Availability = mi.dwFlags.ToString(),
+                            Handle = hMonitor,
+                            Top = mi.rcMonitor.Top,
+                            Left = mi.rcMonitor.Left
+                        };
                         col.Add(di);
                     }
                     return true;
@@ -777,10 +778,9 @@ public DisplayInfoCollection GetDisplays()
         // Deals with getting a window's size
         public static Size GetWindowSize(IntPtr hWnd)
         {
-            RECT pRect;
             Size cSize = new Size();
             // get coordinates relative to window
-            GetWindowRect(hWnd, out pRect);
+            GetWindowRect(hWnd, out RECT pRect);
 
             cSize.Width = pRect.Right - pRect.Left;
             cSize.Height = pRect.Bottom - pRect.Top;
@@ -790,8 +790,7 @@ public static Size GetWindowSize(IntPtr hWnd)
         // Have a guess what this does you fkn idiot
         public static Point GetCursorPosition()
         {
-            POINT lpPoint;
-            GetCursorPos(out lpPoint);
+            GetCursorPos(out POINT lpPoint);
             return lpPoint;
         }
 
@@ -820,8 +819,7 @@ public static List<IntPtr> GetChildWindows(IntPtr parent)
         private static bool EnumWindow(IntPtr handle, IntPtr pointer)
         {
             GCHandle gch = GCHandle.FromIntPtr(pointer);
-            List<IntPtr> list = gch.Target as List<IntPtr>;
-            if (list == null)
+            if (!(gch.Target is List<IntPtr> list))
             {
                 throw new InvalidCastException("GCHandle Target could not be cast as List<IntPtr>");
             }
@@ -970,8 +968,7 @@ public void SetWindowSizeAndLock(App i, IntPtr hwnd)
             try
             {
                 SetParent(hwnd, DesktopHandle);
-                RECT PosTarget;
-                GetWindowRect(hwnd, out PosTarget);
+                GetWindowRect(hwnd, out RECT PosTarget);
                 if (i.Xpos == "X")
                 {
                     i.Xpos = PosTarget.Top.ToString();