Skip to content

Commit 05dec77

Browse files
committed
Code Quality: Fixed improper usage of SettingsExpander.Items
1 parent c38c680 commit 05dec77

File tree

4 files changed

+9
-10
lines changed

4 files changed

+9
-10
lines changed

src/Files.App/Views/Settings/AppearancePage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,14 +152,14 @@
152152
</Flyout>
153153
</Button.Flyout>
154154
</Button>
155-
<wctcontrols:SettingsExpander.Items>
155+
<wctcontrols:SettingsExpander.ItemsHeader>
156156
<GridView
157157
Padding="8"
158158
HorizontalAlignment="Stretch"
159159
ItemTemplate="{StaticResource AppThemeResourcesItemTemplate}"
160160
ItemsSource="{x:Bind ViewModel.AppThemeResources, Mode=OneWay}"
161161
SelectedItem="{x:Bind ViewModel.SelectedAppThemeResources, Mode=TwoWay}" />
162-
</wctcontrols:SettingsExpander.Items>
162+
</wctcontrols:SettingsExpander.ItemsHeader>
163163
</wctcontrols:SettingsExpander>
164164

165165
<!-- App Background Image -->

src/Files.App/Views/Settings/DevToolsPage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
AutomationProperties.Name="{helpers:ResourceString Name=DisplayOpenIDE}"
5555
ItemsSource="{x:Bind ViewModel.OpenInIDEOptions.Values}"
5656
SelectedItem="{x:Bind ViewModel.SelectedOpenInIDEOption, Mode=TwoWay}" />
57-
<wctcontrols:SettingsExpander.Items>
57+
<wctcontrols:SettingsExpander.ItemsHeader>
5858
<StackPanel Orientation="Vertical">
5959
<Grid
6060
x:Name="IDEConfigGrid"
@@ -207,7 +207,7 @@
207207
Style="{StaticResource AccentButtonStyle}" />
208208
</StackPanel>
209209
</StackPanel>
210-
</wctcontrols:SettingsExpander.Items>
210+
</wctcontrols:SettingsExpander.ItemsHeader>
211211
</wctcontrols:SettingsExpander>
212212

213213
<!-- Connect to GitHub -->

src/Files.App/Views/Settings/FoldersPage.xaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@
173173
</wctcontrols:SettingsCard.HeaderIcon>
174174

175175
<uc:ComboBoxEx
176-
MinWidth="140"
177176
AutomationProperties.Name="{helpers:ResourceString Name=SizeFormat}"
178177
ItemsSource="{x:Bind ViewModel.SizeUnitsOptions.Values}"
179178
SelectedItem="{x:Bind ViewModel.SizeUnitFormat, Mode=TwoWay}" />
@@ -185,15 +184,15 @@
185184
<FontIcon Glyph="&#xEE40;" />
186185
</wctcontrols:SettingsExpander.HeaderIcon>
187186
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=CalculateFolderSizes}" IsOn="{x:Bind ViewModel.CalculateFolderSizes, Mode=TwoWay}" />
188-
<wctcontrols:SettingsExpander.Items>
187+
<wctcontrols:SettingsExpander.ItemsHeader>
189188
<InfoBar
190-
CornerRadius="0,0,2,2"
189+
CornerRadius="0"
191190
IsClosable="False"
192191
IsIconVisible="True"
193192
IsOpen="True"
194193
Message="{helpers:ResourceString Name=ShowFolderSizesWarning}"
195194
Severity="Warning" />
196-
</wctcontrols:SettingsExpander.Items>
195+
</wctcontrols:SettingsExpander.ItemsHeader>
197196
</wctcontrols:SettingsExpander>
198197
</StackPanel>
199198
</Grid>

src/Files.App/Views/Settings/TagsPage.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
</wctcontrols:SettingsExpander.HeaderIcon>
5454

5555
<Button Command="{x:Bind ViewModel.AddTagCommand, Mode=OneWay}" Content="{helpers:ResourceString Name=NewTag}" />
56-
<wctcontrols:SettingsExpander.Items>
56+
<wctcontrols:SettingsExpander.ItemsHeader>
5757
<StackPanel>
5858
<!-- Create new tag -->
5959
<Grid
@@ -340,7 +340,7 @@
340340
</ListView.ItemTemplate>
341341
</ListView>
342342
</StackPanel>
343-
</wctcontrols:SettingsExpander.Items>
343+
</wctcontrols:SettingsExpander.ItemsHeader>
344344
</wctcontrols:SettingsExpander>
345345
</StackPanel>
346346
</Grid>

0 commit comments

Comments
 (0)