Skip to content

Commit ba13a05

Browse files
committed
More code cleanup
1 parent 0224b92 commit ba13a05

File tree

1 file changed

+10
-17
lines changed

1 file changed

+10
-17
lines changed

src/UniGetUI/Interface/MainWindow.xaml.cs

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,15 @@
77
using Microsoft.UI.Xaml.Input;
88
using Microsoft.UI.Xaml.Media.Imaging;
99
using Microsoft.Win32;
10-
using System;
11-
using System.Collections.Generic;
12-
using System.IO;
13-
using System.Reflection;
14-
using System.Threading.Tasks;
15-
using UniGetUI.Core;
10+
using System.Runtime.InteropServices;
1611
using UniGetUI.Core.Data;
17-
using UniGetUI.Interface.Widgets;
18-
using UniGetUI.PackageEngine.Classes;
19-
using Windows.ApplicationModel.DataTransfer;
2012
using UniGetUI.Core.Logging;
21-
using Windows.Foundation.Collections;
2213
using UniGetUI.Core.SettingsEngine;
23-
using UniGetUI.PackageEngine.PackageClasses;
2414
using UniGetUI.Core.Tools;
25-
using System.Runtime.InteropServices;
15+
using UniGetUI.Interface.Widgets;
16+
using UniGetUI.PackageEngine.PackageClasses;
17+
using Windows.ApplicationModel.DataTransfer;
18+
using Windows.Foundation.Collections;
2619

2720
namespace UniGetUI.Interface
2821
{
@@ -500,7 +493,7 @@ private async void SaveGeometry()
500493
}
501494
else Logger.Warn("MainWindow.AppWindow.Presenter is not OverlappedPresenter presenter!");
502495

503-
var geometry = $"{AppWindow.Position.X},{AppWindow.Position.Y},{AppWindow.Size.Width},{AppWindow.Size.Height},{windowState}";
496+
string geometry = $"{AppWindow.Position.X},{AppWindow.Position.Y},{AppWindow.Size.Width},{AppWindow.Size.Height},{windowState}";
504497

505498
Logger.Debug($"Saving window geometry {geometry}");
506499
Settings.SetValue("WindowGeometry", geometry);
@@ -509,7 +502,7 @@ private async void SaveGeometry()
509502
private void RestoreSize()
510503
{
511504

512-
var geometry = Settings.GetValue("WindowGeometry");
505+
string geometry = Settings.GetValue("WindowGeometry");
513506
string[] items = geometry.Split(",");
514507
if (items.Length != 5)
515508
{
@@ -550,11 +543,11 @@ private void RestoreSize()
550543
}
551544
private bool IsRectangleFullyVisible(int x, int y, int width, int height)
552545
{
553-
List<MONITORINFO> monitorInfos = new List<MONITORINFO>();
546+
List<MONITORINFO> monitorInfos = new();
554547

555548
MonitorEnumDelegate callback = (IntPtr hMonitor, IntPtr hdcMonitor, ref RECT lprcMonitor, IntPtr dwData) =>
556549
{
557-
MONITORINFO monitorInfo = new MONITORINFO();
550+
MONITORINFO monitorInfo = new();
558551
monitorInfo.cbSize = Marshal.SizeOf(typeof(MONITORINFO));
559552
if (GetMonitorInfo(hMonitor, ref monitorInfo)) monitorInfos.Add(monitorInfo);
560553
return true;
@@ -567,7 +560,7 @@ private bool IsRectangleFullyVisible(int x, int y, int width, int height)
567560
int maxX = int.MinValue;
568561
int maxY = int.MinValue;
569562

570-
foreach (var monitorInfo in monitorInfos)
563+
foreach (MONITORINFO monitorInfo in monitorInfos)
571564
{
572565
if (monitorInfo.rcMonitor.Left < minX) minX = monitorInfo.rcMonitor.Left;
573566
if (monitorInfo.rcMonitor.Top < minY) minY = monitorInfo.rcMonitor.Top;

0 commit comments

Comments
 (0)