Skip to content

Code Quality: Resolve some of AOT warnings in Files.App.Controls #18458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
0x5bfa wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −16
Open

Code Quality: Resolve some of AOT warnings in Files.App.Controls #18458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Files.App.Controls/BreadcrumbBar/BreadcrumbBar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
ChevronToolTip="{TemplateBinding RootItemChevronToolTip}"
CornerRadius="{StaticResource BreadcrumbBarRootItemCornerRadius}"
ItemToolTip="{TemplateBinding RootItemToolTip}">
<ContentPresenter Content="{Binding RootItem, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
<ContentPresenter Content="{TemplateBinding RootItem}" />
</local:BreadcrumbBarItem>

<local:BreadcrumbBarItem
Expand All @@ -77,8 +77,8 @@
Grid.Column="2"
Margin="{StaticResource BreadcrumbBarItemMargin}"
HorizontalAlignment="Left"
ItemTemplate="{Binding ItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
ItemTemplate="{TemplateBinding ItemTemplate}"
ItemsSource="{TemplateBinding ItemsSource}" />

</Grid>
</ControlTemplate>
Expand Down
20 changes: 10 additions & 10 deletions src/Files.App.Controls/Omnibar/Omnibar.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
Grid.Row="0"
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}"
Padding="{Binding AutoSuggestBoxPadding, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Padding="{TemplateBinding AutoSuggestBoxPadding}"
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
Background="{TemplateBinding Background}"
Expand Down Expand Up @@ -136,12 +136,12 @@
Height="{StaticResource OmnibarModeDefaultHeight}"
Margin="1"
AutomationProperties.AccessibilityView="Content"
AutomationProperties.Name="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
AutomationProperties.Name="{TemplateBinding ModeName}"
Background="{TemplateBinding Background}"
BorderBrush="{TemplateBinding BorderBrush}"
BorderThickness="0"
CornerRadius="{TemplateBinding CornerRadius}"
ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
ToolTipService.ToolTip="{TemplateBinding ModeName}">
<Button.Resources>
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="{ThemeResource SubtleFillColorSecondary}" />
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="{ThemeResource SubtleFillColorTertiary}" />
Expand All @@ -152,14 +152,14 @@
x:Name="PART_ModeButtonInactiveIconPresenter"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{Binding IconOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Content="{TemplateBinding IconOnInactive}"
Visibility="Visible" />

<ContentPresenter
x:Name="PART_ModeButtonActiveIconPresenter"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="{Binding IconOnActive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Content="{TemplateBinding IconOnActive}"
Visibility="Collapsed" />
</Grid>
</Button>
Expand All @@ -169,7 +169,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
Content="{Binding ContentOnInactive, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
Content="{TemplateBinding ContentOnInactive}"
Visibility="Collapsed" />

<VisualStateManager.VisualStateGroups>
Expand Down Expand Up @@ -349,7 +349,7 @@
<TextBlock
x:Name="PlaceholderTextContentPresenter"
VerticalAlignment="Center"
Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForeground}}"
Foreground="{TemplateBinding PlaceholderForeground}"
Copy link
Copy Markdown
Member Author

@0x5bfa 0x5bfa May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's alright, we don't set PlaceholderForeground here.

IsHitTestVisible="False"
Text="{TemplateBinding PlaceholderText}"
TextAlignment="{TemplateBinding TextAlignment}"
Expand Down Expand Up @@ -395,7 +395,7 @@
<VisualState x:Name="Normal" />
<VisualState x:Name="Disabled">
<VisualState.Setters>
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundDisabled}}" />
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{ThemeResource TextControlPlaceholderForegroundDisabled}" />
<Setter Target="HeaderContentPresenter.Foreground" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundDisabled}" />
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource TextControlBorderBrushDisabled}" />
Expand All @@ -404,7 +404,7 @@
</VisualState>
<VisualState x:Name="PointerOver">
<VisualState.Setters>
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundPointerOver}}" />
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{ThemeResource TextControlPlaceholderForegroundPointerOver}" />
<Setter Target="HeaderContentPresenter.Foreground" Value="{ThemeResource TextControlHeaderForegroundDisabled}" />
<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundPointerOver}" />
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource CircleElevationBorderBrush}" />
Expand All @@ -413,7 +413,7 @@
</VisualState>
<VisualState x:Name="Focused">
<VisualState.Setters>
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource TextControlPlaceholderForegroundFocused}}" />
<Setter Target="PlaceholderTextContentPresenter.Foreground" Value="{ThemeResource TextControlPlaceholderForegroundFocused}" />
<Setter Target="BorderElement.Background" Value="{ThemeResource TextControlBackgroundFocused}" />
<Setter Target="BorderElement.BorderBrush" Value="{ThemeResource AccentFillColorDefaultBrush}" />
<Setter Target="BorderElement.BorderThickness" Value="{ThemeResource OmnibarBorderThicknessFocused}" />
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App.Controls/SamplePanel/SamplePanel.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<TextBlock
Grid.Row="0"
Style="{StaticResource BodyStrongTextBlockStyle}"
Text="{Binding Header, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
Text="{TemplateBinding Header}" />

<Grid
x:Name="PART_RootPanel"
Expand All @@ -50,7 +50,7 @@
<ContentPresenter
Grid.Column="0"
Padding="{TemplateBinding Padding}"
Content="{Binding MainContent, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
Content="{TemplateBinding MainContent}" />

<StackPanel
Grid.Column="1"
Expand All @@ -74,7 +74,7 @@
</SelectorBarItem>
</SelectorBar>

<ContentPresenter Margin="0,12,0,0" Content="{Binding SideContent, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}" />
<ContentPresenter Margin="0,12,0,0" Content="{TemplateBinding SideContent}" />

<TextBlock
x:Name="PART_NothingToShowTextBlock"
Expand Down
Loading