Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

fix: use ItemsControl for better height handle

itsfatduck937a75beeffd
diff --git a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
index 7adfe9b..5c2f89b 100644
--- a/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
+++ b/optimizerDuck/UI/Views/Pages/BloatwarePage.xaml
@@ -1,7 +1,16 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ ScrollViewer.CanContentScroll="False"
+ Title="BloatwarePage"
+ d:DataContext="{d:DesignInstance local:BloatwarePage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.BloatwarePage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:bloatware="clr-namespace:optimizerDuck.Core.Models.Bloatware"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,16 +18,7 @@
xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="BloatwarePage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance local:BloatwarePage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibilityConverter" />
@@ -33,9 +33,9 @@
Text="{ext:Loc Bloatware.Header.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Body"
+ Margin="0,4,0,0"
Text="{ext:Loc Bloatware.Header.Description}"
TextWrapping="Wrap" />
</StackPanel>
@@ -59,26 +59,26 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:SymbolIcon
- Margin="0,0,0,15"
- HorizontalAlignment="Center"
FontSize="46"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,15"
Symbol="DeleteOff24" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="Subtitle"
+ HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Empty.Title}" />
<ui:TextBlock
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Text="{ext:Loc Bloatware.Empty.Description}" />
<ui:Button
- HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc Bloatware.Menu.Refresh}"
+ HorizontalAlignment="Center"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}" />
</StackPanel>
@@ -88,22 +88,22 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
- Margin="0,0,0,5"
HorizontalAlignment="Center"
- VerticalAlignment="Center"
- IsIndeterminate="True" />
+ IsIndeterminate="True"
+ Margin="0,0,0,5"
+ VerticalAlignment="Center" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc Bloatware.Loading}" />
+ HorizontalAlignment="Center"
+ Text="{ext:Loc Bloatware.Loading}"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
<Border
+ CornerRadius="6"
Grid.Row="1"
Padding="8,0,8,0"
- CornerRadius="6"
Visibility="{Binding ViewModel.HasData, Converter={StaticResource BooleanToVisibilityConverter}}">
<Grid RowDefinitions="Auto,Auto,*">
<!-- Search / Filter / Sort toolbar -->
@@ -114,26 +114,26 @@
<!-- Search -->
<ui:TextBox
- MinWidth="200"
- Margin="0,0,8,0"
- VerticalAlignment="Center"
Icon="{ui:SymbolIcon Search24}"
+ Margin="0,0,8,0"
+ MinWidth="200"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
+ VerticalAlignment="Center" />
<!-- Filter by Risk -->
<ComboBox
Margin="0,0,8,0"
- VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedRiskFilterIndex}"
ToolTip="{ext:Loc Common.Filter}"
ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top">
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="Filter24" />
<TextBlock
Grid.Column="1"
@@ -142,21 +142,21 @@
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
Foreground="{DynamicResource SystemFillColorSuccessBrush}"
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="ShieldCheckmark24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Safe}" />
</Grid>
</ComboBoxItem>
<ComboBoxItem HorizontalContentAlignment="Left">
- <Grid HorizontalAlignment="Left" ColumnDefinitions="Auto Auto">
+ <Grid ColumnDefinitions="Auto Auto" HorizontalAlignment="Left">
<ui:SymbolIcon
- Margin="0,0,6,0"
- HorizontalAlignment="Left"
Foreground="{DynamicResource SystemFillColorCautionBrush}"
+ HorizontalAlignment="Left"
+ Margin="0,0,6,0"
Symbol="Warning24" />
<TextBlock Grid.Column="1" Text="{ext:Loc Optimizer.UI.Risk.Moderate}" />
</Grid>
@@ -165,11 +165,11 @@
<!-- Sort By -->
<ComboBox
Margin="0,0,8,0"
- VerticalAlignment="Center"
SelectedIndex="{Binding ViewModel.SelectedSortByIndex}"
ToolTip="{ext:Loc Common.SortBy}"
ToolTipService.BetweenShowDelay="160"
- ToolTipService.Placement="Top">
+ ToolTipService.Placement="Top"
+ VerticalAlignment="Center">
<ComboBoxItem Content="{ext:Loc Common.SortBy.Default}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Name}" />
<ComboBoxItem Content="{ext:Loc Common.SortBy.Publisher}" />
@@ -234,44 +234,44 @@
VerticalAlignment="Center"
Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource ZeroToVisibilityConverter}}">
<ui:SymbolIcon
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
FontSize="36"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Symbol="SearchInfo24" />
<ui:TextBlock
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
Text="{ext:Loc Bloatware.Search.NoResults}" />
</StackPanel>
- <ui:VirtualizingItemsControl
+ <ItemsControl
Grid.Row="2"
ItemsSource="{Binding ViewModel.AppxPackages}"
Visibility="{Binding ViewModel.AppxPackages.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
- <ui:VirtualizingItemsControl.Template>
+ <ItemsControl.Template>
<ControlTemplate TargetType="ItemsControl">
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
<ItemsPresenter />
</ScrollViewer>
</ControlTemplate>
- </ui:VirtualizingItemsControl.Template>
+ </ItemsControl.Template>
<!-- Layout panel -->
- <ui:VirtualizingItemsControl.ItemsPanel>
+ <ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
</ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
+ </ItemsControl.ItemsPanel>
<!-- Item template -->
- <ui:VirtualizingItemsControl.ItemTemplate>
+ <ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type bloatware:AppXPackage}">
<Border
- Margin="0,0,0,4"
- Padding="12"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="6">
+ CornerRadius="6"
+ Margin="0,0,0,4"
+ Padding="12">
<Grid>
<Grid.ColumnDefinitions>
@@ -284,19 +284,19 @@
<!-- Checkbox -->
<CheckBox
Grid.Column="0"
+ IsChecked="{Binding IsSelected, Mode=TwoWay}"
Margin="0,4,12,0"
- VerticalAlignment="Top"
- IsChecked="{Binding IsSelected, Mode=TwoWay}" />
+ VerticalAlignment="Top" />
<!-- Logo Image -->
<Image
Grid.Column="1"
- Width="36"
Height="36"
Margin="0,0,12,0"
- VerticalAlignment="Top"
Source="{Binding LogoImage}"
- Stretch="UniformToFill" />
+ Stretch="UniformToFill"
+ VerticalAlignment="Top"
+ Width="36" />
<!-- Content -->
<StackPanel Grid.Column="2">
@@ -308,25 +308,25 @@
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="5"
+ HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,1"
- HorizontalAlignment="Left"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="5">
+ VerticalAlignment="Center">
<!-- Version -->
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Body"
- Text="{Binding Version}" />
+ Text="{Binding Version}"
+ VerticalAlignment="Center" />
</Border>
<Border
+ CornerRadius="5"
+ HorizontalAlignment="Left"
Margin="5,0,0,0"
Padding="4,2"
- HorizontalAlignment="Left"
- CornerRadius="5"
Visibility="{Binding ShouldVisibleRisk, Converter={StaticResource BooleanToVisibilityConverter}}">
<Border.Style>
<Style TargetType="Border">
@@ -340,50 +340,50 @@
</Border.Style>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Margin="0,0,5,0"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="0,0,5,0"
Symbol="{Binding RiskVisual.Icon}" />
<ui:TextBlock
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ HorizontalAlignment="Center"
Text="{Binding RiskVisual.Display}"
- TextWrapping="Wrap" />
+ TextWrapping="Wrap"
+ VerticalAlignment="Center" />
</StackPanel>
</Border>
</DockPanel>
<!-- Publisher -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{Binding Publisher}"
TextTrimming="CharacterEllipsis" />
<!-- Install location -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{Binding InstallLocation}"
TextTrimming="CharacterEllipsis" />
<!-- Package full name -->
<ui:TextBlock
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Margin="0,4,0,0"
Text="{Binding PackageFullName}"
TextTrimming="CharacterEllipsis" />
</StackPanel>
</Grid>
</Border>
</DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
</Grid>
</Border>
</Grid>
diff --git a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
index 9716032..b57eff7 100644
--- a/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/DiskCleanupPage.xaml
@@ -1,7 +1,16 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ ScrollViewer.CanContentScroll="False"
+ Title="DiskCleanupPage"
+ d:DataContext="{d:DesignInstance local:DiskCleanupPage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.DiskCleanupPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:cleanup="clr-namespace:optimizerDuck.Core.Models.Cleanup"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -9,16 +18,7 @@
xmlns:local="clr-namespace:optimizerDuck.UI.Views.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="DiskCleanupPage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance local:DiskCleanupPage}"
- d:DesignHeight="1200"
- d:DesignWidth="800"
- ui:Design.Background="Black"
- ui:Design.Foreground="White"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<converters:GreaterThanZeroToVisibilityConverter x:Key="GreaterThanZeroToVisibilityConverter" />
@@ -34,9 +34,9 @@
Text="{ext:Loc DiskCleanup.Header.Title}"
TextWrapping="Wrap" />
<ui:TextBlock
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Body"
+ Margin="0,4,0,0"
Text="{ext:Loc DiskCleanup.Header.Description}"
TextWrapping="Wrap" />
</StackPanel>
@@ -45,29 +45,29 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel
HorizontalAlignment="Center"
- VerticalAlignment="Center"
- Orientation="Vertical">
+ Orientation="Vertical"
+ VerticalAlignment="Center">
<ui:SymbolIcon
- Margin="0,0,0,16"
- HorizontalAlignment="Center"
FontSize="48"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,16"
Symbol="HardDrive20" />
<ui:ProgressRing
- Width="36"
Height="36"
- Margin="0,0,0,12"
HorizontalAlignment="Center"
- IsIndeterminate="True" />
+ IsIndeterminate="True"
+ Margin="0,0,0,12"
+ Width="36" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="BodyStrong"
+ HorizontalAlignment="Center"
Text="{ext:Loc DiskCleanup.Loading}" />
<ui:TextBlock
- Margin="0,4,0,0"
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
+ HorizontalAlignment="Center"
+ Margin="0,4,0,0"
Text="{ext:Loc DiskCleanup.Header.Description}" />
</StackPanel>
</Border>
@@ -80,32 +80,32 @@
<!-- Summary card -->
<Border
- Margin="0,0,0,12"
- Padding="16"
Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="8">
+ CornerRadius="8"
+ Margin="0,0,0,12"
+ Padding="16">
<Grid ColumnDefinitions="Auto,*,Auto">
<!-- Icon -->
<Border
- Width="44"
+ CornerRadius="22"
Height="44"
Margin="0,0,16,0"
VerticalAlignment="Center"
- CornerRadius="22">
+ Width="44">
<ui:SymbolIcon
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontSize="22"
- Symbol="HardDrive20" />
+ HorizontalAlignment="Center"
+ Symbol="HardDrive20"
+ VerticalAlignment="Center" />
</Border>
<!-- Info -->
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<ui:TextBlock FontTypography="BodyStrong" Text="{ext:Loc DiskCleanup.TotalSpace}" />
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Secondary"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{ext:Loc DiskCleanup_ItemsAndFilesSelected,
{Binding ViewModel.TotalSelectedSizeFormatted},
{Binding ViewModel.SelectedCount},
@@ -115,19 +115,19 @@
<!-- Scanning indicator in summary -->
<StackPanel
Grid.Column="2"
- VerticalAlignment="Center"
Orientation="Horizontal"
+ VerticalAlignment="Center"
Visibility="{Binding ViewModel.IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}">
<ui:ProgressRing
- Width="16"
Height="16"
+ IsIndeterminate="True"
Margin="0,0,8,0"
- IsIndeterminate="True" />
+ Width="16" />
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
- Text="{ext:Loc DiskCleanup.Scanning}" />
+ Text="{ext:Loc DiskCleanup.Scanning}"
+ VerticalAlignment="Center" />
</StackPanel>
</Grid>
</Border>
@@ -178,8 +178,8 @@
<ui:Button.Content>
<StackPanel Orientation="Horizontal">
<ui:SymbolIcon
- Margin="0,0,6,0"
FontSize="18"
+ Margin="0,0,6,0"
Symbol="Delete24" />
<TextBlock Text="{ext:Loc DiskCleanup.Button.CleanSelected, {Binding ViewModel.TotalSelectedSizeFormatted}}" />
</StackPanel>
@@ -216,26 +216,28 @@
</StackPanel>
<!-- Items list (virtualized) -->
- <ui:VirtualizingItemsControl Grid.Row="3" ItemsSource="{Binding ViewModel.CleanupItems}">
- <ui:VirtualizingItemsControl.Template>
+ <ItemsControl Grid.Row="3" ItemsSource="{Binding ViewModel.CleanupItems}">
+ <ItemsControl.Template>
<ControlTemplate TargetType="ItemsControl">
<ScrollViewer HorizontalScrollBarVisibility="Disabled">
<ItemsPresenter />
</ScrollViewer>
</ControlTemplate>
- </ui:VirtualizingItemsControl.Template>
- <ui:VirtualizingItemsControl.ItemsPanel>
+ </ItemsControl.Template>
+
+ <ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<VirtualizingStackPanel />
</ItemsPanelTemplate>
- </ui:VirtualizingItemsControl.ItemsPanel>
- <ui:VirtualizingItemsControl.ItemTemplate>
+ </ItemsControl.ItemsPanel>
+
+ <ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type cleanup:CleanupItem}">
<Border
- Margin="0,0,0,4"
- Padding="14"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="8">
+ CornerRadius="8"
+ Margin="0,0,0,4"
+ Padding="14">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -247,47 +249,47 @@
<!-- Checkbox -->
<CheckBox
Grid.Column="0"
+ IsChecked="{Binding IsSelected, Mode=TwoWay}"
Margin="0,0,12,0"
- VerticalAlignment="Center"
- IsChecked="{Binding IsSelected, Mode=TwoWay}" />
+ VerticalAlignment="Center" />
<!-- Icon with circle background -->
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="19"
Grid.Column="1"
- Width="38"
Height="38"
Margin="0,0,14,0"
VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="19">
+ Width="38">
<ui:SymbolIcon
- HorizontalAlignment="Center"
- VerticalAlignment="Center"
FontSize="20"
Foreground="{DynamicResource TextFillColorSecondaryBrush}"
- Symbol="{Binding Icon}" />
+ HorizontalAlignment="Center"
+ Symbol="{Binding Icon}"
+ VerticalAlignment="Center" />
</Border>
<!-- Info -->
<StackPanel Grid.Column="2" VerticalAlignment="Center">
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Body"
+ Margin="0,2,0,0"
Text="{Binding Description}"
TextWrapping="Wrap" />
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Margin="0,2,0,0"
Text="{Binding Path}"
TextTrimming="CharacterEllipsis" />
<Border
- Margin="0,6,0,0"
+ CornerRadius="10"
HorizontalAlignment="Left"
- CornerRadius="10">
+ Margin="0,6,0,0">
<Border.Style>
<Style TargetType="Border">
<Setter Property="Visibility" Value="{Binding IsScanned, Converter={StaticResource BooleanToVisibilityConverter}}" />
@@ -325,15 +327,16 @@
Foreground="{DynamicResource TextFillColorInverseBrush}"
Text="{Binding FormattedSize}" />
<ui:TextBlock
- Margin="6,0,6,0"
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
+ Margin="6,0,6,0"
Opacity="0.8"
Text="•" />
<ui:TextBlock
FontTypography="Caption"
Foreground="{DynamicResource TextFillColorInverseBrush}"
- Text="{ext:Loc DiskCleanup_FilesCount, {Binding FileCount}}" />
+ Text="{ext:Loc DiskCleanup_FilesCount,
+ {Binding FileCount}}" />
</StackPanel>
</Border>
<Border>
@@ -359,25 +362,25 @@
<!-- Scanning / Cleaning spinners -->
<StackPanel
Grid.Column="3"
- Margin="14,0,0,0"
HorizontalAlignment="Right"
+ Margin="14,0,0,0"
VerticalAlignment="Center">
<ui:ProgressRing
- Width="22"
Height="22"
IsIndeterminate="True"
- Visibility="{Binding IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}" />
+ Visibility="{Binding IsScanning, Converter={StaticResource BooleanToVisibilityConverter}}"
+ Width="22" />
<ui:ProgressRing
- Width="22"
Height="22"
IsIndeterminate="True"
- Visibility="{Binding IsCleaning, Converter={StaticResource BooleanToVisibilityConverter}}" />
+ Visibility="{Binding IsCleaning, Converter={StaticResource BooleanToVisibilityConverter}}"
+ Width="22" />
</StackPanel>
</Grid>
</Border>
</DataTemplate>
- </ui:VirtualizingItemsControl.ItemTemplate>
- </ui:VirtualizingItemsControl>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
</Grid>
</Grid>
</Page>
\ No newline at end of file
diff --git a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
index 2877f11..7b3d8a4 100644
--- a/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
+++ b/optimizerDuck/UI/Views/Pages/StartupManagerPage.xaml
@@ -1,7 +1,16 @@
<Page
+ Foreground="{DynamicResource TextFillColorPrimaryBrush}"
+ Margin="0,32,0,0"
+ ScrollViewer.CanContentScroll="False"
+ Title="StartupManagerPage"
+ d:DataContext="{d:DesignInstance local:StartupManagerPage}"
+ d:DesignHeight="1200"
+ d:DesignWidth="800"
+ mc:Ignorable="d"
+ ui:Design.Background="Black"
+ ui:Design.Foreground="White"
x:Class="optimizerDuck.UI.Views.Pages.StartupManagerPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
- xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:optimizerDuck.Common.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:ext="clr-namespace:optimizerDuck.Common.Extensions"
@@ -9,12 +18,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:models="clr-namespace:optimizerDuck.Core.Models.StartupManager"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
- Title="StartupManagerPage"
- Margin="0,32,0,0"
- d:DataContext="{d:DesignInstance local:StartupManagerPage}"
- Foreground="{DynamicResource TextFillColorPrimaryBrush}"
- ScrollViewer.CanContentScroll="False"
- mc:Ignorable="d">
+ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Page.Resources>
<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -27,9 +31,9 @@
<StackPanel Margin="0,0,0,20">
<ui:TextBlock FontTypography="Title" Text="{ext:Loc StartupManager.Header.Title}" />
<ui:TextBlock
- Margin="0,4,0,0"
Appearance="Secondary"
FontTypography="Body"
+ Margin="0,4,0,0"
Text="{ext:Loc StartupManager.Header.Description}"
TextWrapping="Wrap" />
</StackPanel>
@@ -38,21 +42,21 @@
<Border Grid.Row="1" Visibility="{Binding ViewModel.IsLoading, Converter={StaticResource BooleanToVisibilityConverter}}">
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:ProgressRing
- Width="48"
Height="48"
- Margin="0,0,0,16"
HorizontalAlignment="Center"
+ IsIndeterminate="True"
+ Margin="0,0,0,16"
VerticalAlignment="Center"
- IsIndeterminate="True" />
+ Width="48" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="BodyStrong"
+ HorizontalAlignment="Center"
Text="{ext:Loc StartupManager.Loading}" />
<ui:TextBlock
- Margin="0,4,0,0"
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Caption"
+ HorizontalAlignment="Center"
+ Margin="0,4,0,0"
Text="{ext:Loc StartupManager.Loading.Hint}" />
</StackPanel>
</Border>
@@ -76,26 +80,26 @@
<StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<ui:SymbolIcon
- Margin="0,0,0,15"
- HorizontalAlignment="Center"
FontSize="46"
Foreground="{DynamicResource SystemFillColorCriticalBrush}"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,15"
Symbol="AppGeneric24" />
<ui:TextBlock
- HorizontalAlignment="Center"
FontTypography="Subtitle"
+ HorizontalAlignment="Center"
Text="{ext:Loc StartupManager.Empty.Title}" />
<ui:TextBlock
- Margin="0,0,0,10"
- HorizontalAlignment="Center"
Appearance="Secondary"
FontTypography="Body"
+ HorizontalAlignment="Center"
+ Margin="0,0,0,10"
Text="{ext:Loc StartupManager.Empty.Description}" />
<ui:Button
- HorizontalAlignment="Center"
Appearance="Primary"
Command="{Binding ViewModel.RefreshCommand}"
Content="{ext:Loc StartupManager.Menu.Refresh}"
+ HorizontalAlignment="Center"
Icon="{ui:SymbolIcon ArrowClockwise24,
FontSize=18}" />
</StackPanel>
@@ -111,12 +115,12 @@
Orientation="Horizontal">
<!-- Search -->
<ui:TextBox
- MinWidth="220"
- Margin="0,0,8,0"
- VerticalAlignment="Center"
Icon="{ui:SymbolIcon Search24}"
+ Margin="0,0,8,0"
+ MinWidth="220"
PlaceholderText="{ext:Loc Common.Search.Placeholder}"
- Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}" />
+ Text="{Binding ViewModel.SearchText, UpdateSourceTrigger=PropertyChanged}"
+ VerticalAlignment="Center" />
<ui:Button
Appearance="Primary"
@@ -131,27 +135,27 @@
<StackPanel>
<!-- Startup Apps Section -->
<ui:CardExpander
- Margin="0,0,0,12"
Icon="{ui:SymbolIcon Apps24}"
IsExpanded="True"
+ Margin="0,0,0,12"
Visibility="{Binding ViewModel.Apps.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ui:CardExpander.Header>
<StackPanel Orientation="Horizontal">
<ui:TextBlock
- VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc StartupManager.Apps.Title}" />
+ Text="{ext:Loc StartupManager.Apps.Title}"
+ VerticalAlignment="Center" />
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="10"
Margin="8,0,0,0"
Padding="8,2"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="10">
+ VerticalAlignment="Center">
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{Binding ViewModel.Apps.Count}" />
+ Text="{Binding ViewModel.Apps.Count}"
+ VerticalAlignment="Center" />
</Border>
</StackPanel>
</ui:CardExpander.Header>
@@ -160,10 +164,10 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type models:StartupApp}">
<Border
- Margin="0,0,0,4"
- Padding="12,10"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="6">
+ CornerRadius="6"
+ Margin="0,0,0,4"
+ Padding="12,10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
@@ -174,49 +178,49 @@
<!-- Logo -->
<Image
Grid.Column="0"
- Width="36"
Height="36"
Margin="0,0,12,0"
- VerticalAlignment="Center"
Source="{Binding LogoImage}"
- Stretch="UniformToFill" />
+ Stretch="UniformToFill"
+ VerticalAlignment="Center"
+ Width="36" />
<StackPanel Grid.Column="1" VerticalAlignment="Center">
<!-- Name + Location badge -->
<DockPanel LastChildFill="False">
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding Name}" />
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="4"
Margin="8,0,0,0"
Padding="6,1"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="4">
+ VerticalAlignment="Center">
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{Binding LocationDisplay}" />
+ Text="{Binding LocationDisplay}"
+ VerticalAlignment="Center" />
</Border>
</DockPanel>
<!-- Publisher -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Margin="0,2,0,0"
Text="{Binding Publisher}" />
<!-- Command -->
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Caption"
+ Margin="0,2,0,0"
Text="{Binding Command}"
TextTrimming="CharacterEllipsis" />
</StackPanel>
<ui:ToggleSwitch
Grid.Column="2"
- VerticalAlignment="Center"
- IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
+ IsChecked="{Binding IsEnabled, Mode=TwoWay}"
+ VerticalAlignment="Center" />
</Grid>
</Border>
</DataTemplate>
@@ -226,27 +230,27 @@
<!-- Scheduled Tasks Section -->
<ui:CardExpander
- Margin="0,0,0,12"
Icon="{ui:SymbolIcon TaskListLtr24}"
IsExpanded="True"
+ Margin="0,0,0,12"
Visibility="{Binding ViewModel.Tasks.Count, Converter={StaticResource GreaterThanZeroToVisibilityConverter}}">
<ui:CardExpander.Header>
<StackPanel Orientation="Horizontal">
<ui:TextBlock
- VerticalAlignment="Center"
FontTypography="BodyStrong"
- Text="{ext:Loc StartupManager.Tasks.Title}" />
+ Text="{ext:Loc StartupManager.Tasks.Title}"
+ VerticalAlignment="Center" />
<Border
+ Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
+ CornerRadius="10"
Margin="8,0,0,0"
Padding="8,2"
- VerticalAlignment="Center"
- Background="{DynamicResource CardBackgroundFillColorSecondaryBrush}"
- CornerRadius="10">
+ VerticalAlignment="Center">
<ui:TextBlock
- VerticalAlignment="Center"
Appearance="Tertiary"
FontTypography="Caption"
- Text="{Binding ViewModel.Tasks.Count}" />
+ Text="{Binding ViewModel.Tasks.Count}"
+ VerticalAlignment="Center" />
</Border>
</StackPanel>
</ui:CardExpander.Header>
@@ -255,10 +259,10 @@
<ItemsControl.ItemTemplate>
<DataTemplate DataType="{x:Type models:StartupTask}">
<Border
- Margin="0,0,0,4"
- Padding="12,10"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
- CornerRadius="6">
+ CornerRadius="6"
+ Margin="0,0,0,4"
+ Padding="12,10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
@@ -271,22 +275,22 @@
VerticalAlignment="Center">
<ui:TextBlock FontTypography="BodyStrong" Text="{Binding TaskName}" />
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Secondary"
FontTypography="Caption"
+ Margin="0,2,0,0"
Text="{Binding Description}"
TextTrimming="CharacterEllipsis" />
<ui:TextBlock
- Margin="0,2,0,0"
Appearance="Disabled"
FontTypography="Caption"
+ Margin="0,2,0,0"
Text="{Binding TaskPath}" />
</StackPanel>
<ui:ToggleSwitch
Grid.Column="1"
- VerticalAlignment="Center"
- IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
+ IsChecked="{Binding IsEnabled, Mode=TwoWay}"
+ VerticalAlignment="Center" />
</Grid>
</Border>
</DataTemplate>