Mirrors/Win11Debloat
1
0
Fork 0
mirror of https://github.com/Raphire/Win11Debloat.git synced 2026-06-10 10:36:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly show re-applied features in registry backup overview, properly show applied tweaks checkbox state after registry backup restoration

Browse Source
This commit is contained in:
Jeffrey
2026-05-27 22:05:06 +02:00
parent 6e63b34dbb
commit 6dbaac0513
5 changed files with 161 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Scripts/GUI/Show-MainWindow.ps1
View File

@@ -278,7 +278,15 @@ function Show-MainWindow {
if ($restoreBackupBtn) {
$restoreBackupBtn.Add_Click({
try {
Show-RestoreBackupWindow -Owner $window
$restoreResult = Show-RestoreBackupWindow -Owner $window
if ($restoreResult -and $restoreResult.RestoredRegistry -eq $true) {
RefreshCurrentTweakSystemState -ApplyToUi:$false
if ($ShowCurrentlyAppliedTweaksCheckBox -and $ShowCurrentlyAppliedTweaksCheckBox.IsChecked -eq $true) {
ResetTweaksToSystemState -loadSystemState $true
UpdateTweakPresetStates
}
}
}
catch {
Write-Warning "Restore backup action failed: $($_.Exception.Message)"
@@ -905,10 +913,9 @@ function Show-MainWindow {
}
}
# Reads current registry state and sets each tweak control to reflect whether that tweak is
# currently applied. Also stores the initial state on each control as a NoteProperty so the
# apply handler can detect which controls actually changed.
function LoadCurrentTweakStateIntoUI {
function RefreshCurrentTweakSystemState {
param([bool]$ApplyToUi)
if (-not $script:UiControlMappings) { return }
if (-not $script:Features) { return }
@@ -930,9 +937,12 @@ function Show-MainWindow {
if ($control -is [System.Windows.Controls.CheckBox] -and $mapping.Type -eq 'feature') {
$applied = $false
try { $applied = [bool](Test-FeatureApplied -FeatureId $mapping.FeatureId) } catch {}
$control.IsChecked = $applied
Add-Member -InputObject $control -MemberType NoteProperty -Name 'InitialState' -Value $applied -Force
Add-Member -InputObject $control -MemberType NoteProperty -Name 'SystemState' -Value $applied -Force
if ($ApplyToUi) {
$control.IsChecked = $applied
Add-Member -InputObject $control -MemberType NoteProperty -Name 'InitialState' -Value $applied -Force
}
}
elseif ($control -is [System.Windows.Controls.ComboBox] -and $mapping.Type -eq 'group') {
$groupId = $null
@@ -941,13 +951,23 @@ function Show-MainWindow {
if ($groupId -and $groupMap.ContainsKey($groupId)) {
try { $activeIndex = Get-CurrentGroupActiveIndex -Group $groupMap[$groupId] } catch {}
}
$control.SelectedIndex = $activeIndex
Add-Member -InputObject $control -MemberType NoteProperty -Name 'InitialIndex' -Value $activeIndex -Force
Add-Member -InputObject $control -MemberType NoteProperty -Name 'SystemIndex' -Value $activeIndex -Force
if ($ApplyToUi) {
$control.SelectedIndex = $activeIndex
Add-Member -InputObject $control -MemberType NoteProperty -Name 'InitialIndex' -Value $activeIndex -Force
}
}
}
}
# Reads current registry state and sets each tweak control to reflect whether that tweak is
# currently applied. Also stores the initial state on each control as a NoteProperty so the
# apply handler can detect which controls actually changed.
function LoadCurrentTweakStateIntoUI {
RefreshCurrentTweakSystemState -ApplyToUi:$true
}
# Helper function to load apps and populate the app list panel
function script:LoadAppsWithList($listOfApps) {
$script:MainWindowLastSelectedCheckbox = $null