Skip to content

Commit 5cc35de

Browse files
0x5bfa0x5bfa
committed
Fixed a small issue
1 parent fb4e6c7 commit 5cc35de

File tree

8 files changed

+66
-58
lines changed

8 files changed

+66
-58
lines changed

‎src/Files.App.Controls/Omnibar/Omnibar.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@
7575
Padding="0,2"
7676
HorizontalAlignment="Stretch"
7777
IsItemClickEnabled="True"
78-
ItemTemplate="{Binding CurrentActiveMode.SuggestionItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
79-
ItemsSource="{Binding CurrentActiveMode.SuggestionItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
78+
ItemTemplate="{Binding CurrentSelectedMode.SuggestionItemTemplate, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
79+
ItemsSource="{Binding CurrentSelectedMode.SuggestionItemsSource, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}"
8080
SelectionMode="None" />
8181

8282
</Border>

‎tests/Files.App.UITests/App.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<ResourceDictionary>
1717

18-
<Thickness x:Key="NavigationViewHeaderMargin">36,40,0,0</Thickness>
18+
<Thickness x:Key="NavigationViewHeaderMargin">36,40,0,36</Thickness>
1919

2020
<Style
2121
x:Key="TextExampleCaptionStyle"

‎tests/Files.App.UITests/MainWindow.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,15 @@
8989
<NavigationViewItem.MenuItems>
9090
<NavigationViewItem Content="ThemedIcon" Tag="ThemedIconPage" />
9191
<NavigationViewItem Content="Toolbar" Tag="ToolbarPage" />
92-
<NavigationViewItem Content="Storage Controls" Tag="StorageControlsPage" />
92+
<NavigationViewItem Content="StorageRing/StorageBar" Tag="StorageControlsPage" />
9393
<NavigationViewItem Content="Omnibar" Tag="OmnibarPage" />
9494
</NavigationViewItem.MenuItems>
9595
</NavigationViewItem>
9696
</NavigationView.MenuItems>
9797

9898
<NavigationView.Content>
9999
<ScrollViewer>
100-
<Frame x:Name="MainFrame" />
100+
<Frame x:Name="MainFrame" Padding="36,0,36,36" />
101101
</ScrollViewer>
102102
</NavigationView.Content>
103103

‎tests/Files.App.UITests/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
5252
_ => throw new InvalidOperationException("There's no applicable page associated with the given key."),
5353
});
5454

55-
MainNavigationView.Header = tag.Substring(0, tag.Length - 4);
55+
MainNavigationView.Header = item.Content.ToString();
5656
}
5757

5858
private void AppThemeChangeToggleButton_Click(object sender, RoutedEventArgs e)

‎tests/Files.App.UITests/Views/OmnibarPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1111
mc:Ignorable="d">
1212

13-
<StackPanel Padding="36" Spacing="24">
13+
<StackPanel Spacing="24">
1414

1515
<controls:SamplePanel Header="Default usage">
1616
<controls:SamplePanel.MainContent>

‎tests/Files.App.UITests/Views/StorageControlsPage.xaml‎

Lines changed: 45 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1010
mc:Ignorable="d">
1111

12-
<StackPanel Padding="36" Spacing="24">
12+
<StackPanel Spacing="24">
1313

1414
<!-- Storage Ring -->
1515
<controls:SamplePanel Header="Storage Ring">
@@ -168,74 +168,83 @@
168168
<controls:SamplePanel.SideContent>
169169
<StackPanel Spacing="12">
170170

171-
<NumberBox
172-
x:Name="testWidth"
173-
Header="Width"
174-
SpinButtonPlacementMode="Inline"
175-
Value="100" />
171+
<Grid ColumnSpacing="8">
172+
<Grid.ColumnDefinitions>
173+
<ColumnDefinition Width="*" />
174+
<ColumnDefinition Width="*" />
175+
</Grid.ColumnDefinitions>
176176

177-
<NumberBox
178-
x:Name="testHeight"
179-
Header="Height"
180-
SpinButtonPlacementMode="Inline"
181-
Value="120" />
177+
<NumberBox
178+
x:Name="testWidth"
179+
Grid.Column="0"
180+
Header="Width:"
181+
SpinButtonPlacementMode="Inline"
182+
Value="100" />
183+
184+
<NumberBox
185+
x:Name="testHeight"
186+
Grid.Column="1"
187+
Header="Height:"
188+
SpinButtonPlacementMode="Inline"
189+
Value="120" />
190+
191+
</Grid>
182192

183193
<Slider
184194
x:Name="testValue"
185-
Header="Value ( -10 to 110 )"
195+
Header="Value [-10, 110]:"
186196
Maximum="110"
187197
Minimum="-10"
188198
SmallChange="{x:Bind ringCustom1.SmallChange, Mode=TwoWay}"
189199
Value="50" />
190200

191-
<TextBlock LineHeight="16">
192-
<Run Text="Percent:" />
193-
<LineBreak />
194-
<Run FontWeight="SemiBold" Text="{x:Bind ringCustom1.Percent.ToString(), Mode=OneWay}" />
195-
</TextBlock>
201+
<TextBox
202+
Header="Percent:"
203+
IsReadOnly="True"
204+
Text="{x:Bind ringCustom1.Percent, Mode=OneWay}" />
196205

197206
<ToggleSwitch
198207
x:Name="testIsEnabled"
199-
Header="IsEnabled"
208+
Header="IsEnabled:"
200209
IsOn="True"
201210
OffContent="Disabled"
202211
OnContent="Enabled" />
203212

204213
<Slider
205214
x:Name="testSAngle"
206-
Header="StartAngle ( -180 to 180 )"
215+
Header="StartAngle [-180, 180]:"
207216
Maximum="180"
208217
Minimum="-180"
209218
Value="-150" />
210219

211220
<Slider
212221
x:Name="testMAngle"
213-
Header="MaxAngle ( -180 to 540 )"
222+
Header="MaxAngle [-180, 540]:"
214223
Maximum="540"
215224
Minimum="-180"
216225
Value="150" />
217226

218-
<Grid HorizontalAlignment="Stretch" ColumnSpacing="16">
227+
<Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
219228
<Grid.ColumnDefinitions>
220229
<ColumnDefinition Width="*" />
221230
<ColumnDefinition Width="*" />
222231
</Grid.ColumnDefinitions>
223232
<NumberBox
224233
x:Name="testValueThickness"
225234
Grid.Column="0"
226-
Header="ValueRingThickness"
235+
Header="Value ring thickness:"
227236
Maximum="32"
228237
Minimum="2"
229-
SpinButtonPlacementMode="Compact"
238+
SpinButtonPlacementMode="Inline"
230239
Value="12" />
231240

232241
<NumberBox
233242
x:Name="testTrackThickness"
234243
Grid.Column="1"
235-
Header="TrackRingThickness"
244+
Header="Track ring thickness:"
236245
Maximum="32"
237246
Minimum="2"
238-
SpinButtonPlacementMode="Compact"
247+
SpinButtonPlacementMode="Inline"
239248
Value="4" />
240249
</Grid>
241250
</StackPanel>
@@ -406,26 +415,25 @@
406415

407416
<Slider
408417
x:Name="barTestValue"
409-
Header="Value ( -10 to 110 )"
418+
Header="Value [-10, 110]:"
410419
Maximum="110"
411420
Minimum="-10"
412421
SmallChange="{x:Bind BarCustom01.SmallChange, Mode=TwoWay}"
413422
Value="50" />
414423

415-
<TextBlock LineHeight="16">
416-
<Run Text="Percent:" />
417-
<LineBreak />
418-
<Run FontWeight="SemiBold" Text="{x:Bind BarCustom01.Percent.ToString(), Mode=OneWay}" />
419-
</TextBlock>
424+
<TextBox
425+
Header="Percent:"
426+
IsReadOnly="True"
427+
Text="{x:Bind BarCustom01.Percent, Mode=OneWay}" />
420428

421429
<ToggleSwitch
422430
x:Name="barTestIsEnabled"
423-
Header="IsEnabled"
431+
Header="IsEnabled:"
424432
IsOn="True"
425433
OffContent="Disabled"
426434
OnContent="Enabled" />
427435

428-
<Grid HorizontalAlignment="Stretch" ColumnSpacing="16">
436+
<Grid HorizontalAlignment="Stretch" ColumnSpacing="8">
429437
<Grid.ColumnDefinitions>
430438
<ColumnDefinition Width="*" />
431439
<ColumnDefinition Width="*" />
@@ -434,19 +442,19 @@
434442
<NumberBox
435443
x:Name="barTestValueThickness"
436444
Grid.Column="0"
437-
Header="ValueRingThickness"
445+
Header="Value ring thickness:"
438446
Maximum="32"
439447
Minimum="2"
440-
SpinButtonPlacementMode="Compact"
448+
SpinButtonPlacementMode="Inline"
441449
Value="12" />
442450

443451
<NumberBox
444452
x:Name="barTestTrackThickness"
445453
Grid.Column="1"
446-
Header="TrackRingThickness"
454+
Header="Track ring thickness:"
447455
Maximum="32"
448456
Minimum="2"
449-
SpinButtonPlacementMode="Compact"
457+
SpinButtonPlacementMode="Inline"
450458
Value="4" />
451459

452460
</Grid>

‎tests/Files.App.UITests/Views/ThemedIconPage.xaml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ResourceDictionary>
1919
</Page.Resources>
2020

21-
<StackPanel Padding="36" Spacing="24">
21+
<StackPanel Spacing="24">
2222

2323
<!-- Icon Types and Colors -->
2424
<controls:SamplePanel Header="Icon Types and Colors">
@@ -398,15 +398,15 @@
398398

399399
<ToggleSwitch
400400
x:Name="ContrastToggle"
401-
Header="High Contrast:"
401+
Header="High contrast:"
402402
IsOn="True" />
403403

404404
<ToggleSwitch
405405
x:Name="FilledToggle"
406-
Header="Toggle IsFilled:"
406+
Header="IsFilled:"
407407
IsOn="True"
408-
OffContent="Default"
409-
OnContent="Filled" />
408+
OffContent="False (Default)"
409+
OnContent="True" />
410410

411411
</StackPanel>
412412
</controls:SamplePanel.SideContent>
@@ -559,19 +559,19 @@
559559
</StackPanel>
560560
</controls:SamplePanel.MainContent>
561561
<controls:SamplePanel.SideContent>
562-
<StackPanel>
562+
<StackPanel Spacing="12">
563563

564564
<ToggleSwitch
565565
x:Name="TestToggleSwitch"
566566
AutomationProperties.Name="TestToggleSwitch1"
567-
Header="Toggle all ToggleButtons" />
567+
Header="Toggle all ToggleButtons:" />
568568

569569
<ToggleSwitch
570570
x:Name="EnabledToggle"
571-
Header="Toggle IsEnabled"
571+
Header="IsEnabled:"
572572
IsOn="False"
573573
OffContent="Disabled"
574-
OnContent="Enabled" />
574+
OnContent="Enabled (Default)" />
575575

576576
</StackPanel>
577577
</controls:SamplePanel.SideContent>
@@ -754,14 +754,14 @@
754754
<ToggleSwitch
755755
x:Name="OffTestToggleSwitch"
756756
AutomationProperties.Name="OffTestToggleSwitch1"
757-
Header="Toggle all ToggleButtons" />
757+
Header="Toggle all ToggleButtons:" />
758758

759759
<ToggleSwitch
760760
x:Name="OffEnabledToggle"
761-
Header="Toggle IsEnabled"
761+
Header="IsEnabled:"
762762
IsOn="False"
763763
OffContent="Disabled"
764-
OnContent="Enabled" />
764+
OnContent="Enabled (Default)" />
765765

766766
</StackPanel>
767767
</controls:SamplePanel.SideContent>
@@ -843,7 +843,7 @@
843843
x:Name="TestSize"
844844
Width="240"
845845
HorizontalAlignment="Left"
846-
Header="Icon Size"
846+
Header="Icon size:"
847847
Maximum="84"
848848
Minimum="16"
849849
SpinButtonPlacementMode="Inline"

‎tests/Files.App.UITests/Views/ToolbarPage.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1111
mc:Ignorable="d">
1212

13-
<StackPanel Padding="36" Spacing="24">
13+
<StackPanel Spacing="24">
1414

1515
<!-- CommandBar -->
1616
<controls:SamplePanel Header="CommandBar (for comparison)">

0 commit comments

Comments
 (0)