mirror of
https://github.com/wwiinnddyy/LanMountainDesktop.git
synced 2026-06-22 09:14:25 +08:00
0.4.11
This commit is contained in:
@@ -1431,7 +1431,7 @@ public partial class MainWindow
|
||||
ApplyTaskbarActionVisibility(GetCurrentTaskbarContext());
|
||||
}
|
||||
|
||||
private void InitializeDesktopComponentPlacements(AppSettingsSnapshot snapshot)
|
||||
private void InitializeDesktopComponentPlacements(DesktopLayoutSettingsSnapshot snapshot)
|
||||
{
|
||||
_desktopComponentPlacements.Clear();
|
||||
|
||||
@@ -3598,4 +3598,3 @@ public partial class MainWindow
|
||||
ApplyComponentLibraryComponentOffset();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -66,14 +66,14 @@ public partial class MainWindow
|
||||
|
||||
private int TotalSurfaceCount => LauncherSurfaceIndex + 1;
|
||||
|
||||
private void InitializeDesktopSurfaceState(AppSettingsSnapshot snapshot)
|
||||
private void InitializeDesktopSurfaceState(DesktopLayoutSettingsSnapshot snapshot)
|
||||
{
|
||||
var loadedPageCount = snapshot.DesktopPageCount <= 0 ? MinDesktopPageCount : snapshot.DesktopPageCount;
|
||||
_desktopPageCount = Math.Clamp(loadedPageCount, MinDesktopPageCount, MaxDesktopPageCount);
|
||||
_currentDesktopSurfaceIndex = Math.Clamp(snapshot.CurrentDesktopSurfaceIndex, 0, LauncherSurfaceIndex);
|
||||
}
|
||||
|
||||
private void InitializeLauncherVisibilitySettings(AppSettingsSnapshot snapshot)
|
||||
private void InitializeLauncherVisibilitySettings(LauncherSettingsSnapshot snapshot)
|
||||
{
|
||||
_hiddenLauncherFolderPaths.Clear();
|
||||
if (snapshot.HiddenLauncherFolderPaths is not null)
|
||||
|
||||
@@ -864,7 +864,14 @@ public partial class MainWindow
|
||||
return;
|
||||
}
|
||||
|
||||
var snapshot = new AppSettingsSnapshot
|
||||
_appSettingsService.Save(BuildAppSettingsSnapshot());
|
||||
_desktopLayoutSettingsService.Save(BuildDesktopLayoutSettingsSnapshot());
|
||||
_launcherSettingsService.Save(BuildLauncherSettingsSnapshot());
|
||||
}
|
||||
|
||||
private AppSettingsSnapshot BuildAppSettingsSnapshot()
|
||||
{
|
||||
return new AppSettingsSnapshot
|
||||
{
|
||||
GridShortSideCells = _targetShortSideCells,
|
||||
GridSpacingPreset = _gridSpacingPreset,
|
||||
@@ -896,15 +903,27 @@ public partial class MainWindow
|
||||
TaskbarLayoutMode = _taskbarLayoutMode,
|
||||
ClockDisplayFormat = _clockDisplayFormat == ClockDisplayFormat.HourMinute ? "HourMinute" : "HourMinuteSecond",
|
||||
StatusBarSpacingMode = _statusBarSpacingMode,
|
||||
StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent,
|
||||
StatusBarCustomSpacingPercent = _statusBarCustomSpacingPercent
|
||||
};
|
||||
}
|
||||
|
||||
private DesktopLayoutSettingsSnapshot BuildDesktopLayoutSettingsSnapshot()
|
||||
{
|
||||
return new DesktopLayoutSettingsSnapshot
|
||||
{
|
||||
DesktopPageCount = _desktopPageCount,
|
||||
CurrentDesktopSurfaceIndex = _currentDesktopSurfaceIndex,
|
||||
DesktopComponentPlacements = _desktopComponentPlacements.ToList(),
|
||||
DesktopComponentPlacements = _desktopComponentPlacements.ToList()
|
||||
};
|
||||
}
|
||||
|
||||
private LauncherSettingsSnapshot BuildLauncherSettingsSnapshot()
|
||||
{
|
||||
return new LauncherSettingsSnapshot
|
||||
{
|
||||
HiddenLauncherFolderPaths = _hiddenLauncherFolderPaths.OrderBy(path => path, StringComparer.OrdinalIgnoreCase).ToList(),
|
||||
HiddenLauncherAppPaths = _hiddenLauncherAppPaths.OrderBy(path => path, StringComparer.OrdinalIgnoreCase).ToList()
|
||||
};
|
||||
|
||||
_appSettingsService.Save(snapshot);
|
||||
}
|
||||
|
||||
private IDisposable? _persistSettingsDebounceTimer;
|
||||
@@ -2288,4 +2307,3 @@ public partial class MainWindow
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -88,6 +88,8 @@ public partial class MainWindow : Window
|
||||
}
|
||||
private readonly MonetColorService _monetColorService = new();
|
||||
private readonly AppSettingsService _appSettingsService = new();
|
||||
private readonly DesktopLayoutSettingsService _desktopLayoutSettingsService = new();
|
||||
private readonly LauncherSettingsService _launcherSettingsService = new();
|
||||
private readonly ComponentSettingsService _componentSettingsService = new();
|
||||
private readonly LocalizationService _localizationService = new();
|
||||
private readonly TimeZoneService _timeZoneService = new();
|
||||
@@ -193,6 +195,8 @@ public partial class MainWindow : Window
|
||||
|
||||
_suppressSettingsPersistence = true;
|
||||
var snapshot = _appSettingsService.Load();
|
||||
var desktopLayoutSnapshot = _desktopLayoutSettingsService.Load();
|
||||
var launcherSnapshot = _launcherSettingsService.Load();
|
||||
|
||||
if (!string.IsNullOrWhiteSpace(snapshot.TimeZoneId))
|
||||
{
|
||||
@@ -247,9 +251,9 @@ public partial class MainWindow : Window
|
||||
_ = _componentSettingsService.Load();
|
||||
InitializeAutoStartWithWindowsSetting(snapshot);
|
||||
InitializeUpdateSettings(snapshot);
|
||||
InitializeDesktopSurfaceState(snapshot);
|
||||
InitializeLauncherVisibilitySettings(snapshot);
|
||||
InitializeDesktopComponentPlacements(snapshot);
|
||||
InitializeDesktopSurfaceState(desktopLayoutSnapshot);
|
||||
InitializeLauncherVisibilitySettings(launcherSnapshot);
|
||||
InitializeDesktopComponentPlacements(desktopLayoutSnapshot);
|
||||
InitializeSettingsIcons();
|
||||
|
||||
TryRestoreWallpaper(snapshot.WallpaperPath);
|
||||
@@ -1341,4 +1345,3 @@ public partial class MainWindow : Window
|
||||
PersistSettings();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user