Skip to content

Commit fb4e6c7

Browse files
0x5bfa0x5bfa
committed
Updated
1 parent 71cc642 commit fb4e6c7

File tree

5 files changed

+55
-144
lines changed

5 files changed

+55
-144
lines changed

‎src/Files.App.Controls/Omnibar/Omnibar.Properties.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ public partial class Omnibar
1818
public partial IList<OmnibarMode>? Modes { get; set; }
1919

2020
[GeneratedDependencyProperty]
21-
public partial OmnibarMode? CurrentActiveMode { get; set; }
21+
public partial OmnibarMode? CurrentSelectedMode { get; set; }
2222
}
2323
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ internal void ChangeMode(OmnibarMode modeToExpand)
109109
VisualStateManager.GoToState(modeToExpand, "Focused", true);
110110
_modesHostGrid.ColumnDefinitions[_modesHostGrid.Children.IndexOf(modeToExpand)].Width = new(1, GridUnitType.Star);
111111

112-
CurrentActiveMode = modeToExpand;
112+
CurrentSelectedMode = modeToExpand;
113113

114114
UpdateVisualStates();
115115
}
@@ -118,23 +118,23 @@ private void UpdateVisualStates()
118118
{
119119
VisualStateManager.GoToState(this, _isFocused ? "Focused" : "Normal", true);
120120

121-
if (CurrentActiveMode is not null && _autoSuggestPopup is not null)
121+
if (CurrentSelectedMode is not null && _autoSuggestPopup is not null)
122122
{
123123
// Close anyway
124-
if (_autoSuggestPopup.IsOpen && CurrentActiveMode.SuggestionItemsSource is null)
124+
if (_autoSuggestPopup.IsOpen && CurrentSelectedMode.SuggestionItemsSource is null)
125125
VisualStateManager.GoToState(this, "PopupClosed", true);
126126

127127
// Decide open or close
128128
if (_isFocused != _autoSuggestPopup.IsOpen)
129-
VisualStateManager.GoToState(this, _isFocused && CurrentActiveMode.SuggestionItemsSource is not null ? "PopupOpened" : "PopupClosed", true);
129+
VisualStateManager.GoToState(this, _isFocused && CurrentSelectedMode.SuggestionItemsSource is not null ? "PopupOpened" : "PopupClosed", true);
130130
}
131131

132-
if (CurrentActiveMode is not null)
132+
if (CurrentSelectedMode is not null)
133133
VisualStateManager.GoToState(
134-
CurrentActiveMode,
134+
CurrentSelectedMode,
135135
_isFocused
136136
? "Focused"
137-
: CurrentActiveMode.ContentOnInactive is null
137+
: CurrentSelectedMode.ContentOnInactive is null
138138
? "CurrentUnfocusedWithoutInactiveMode"
139139
: "CurrentUnfocusedWithInactiveMode",
140140
true);

‎src/Files.App.Controls/Omnibar/OmnibarMode.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private void UpdateVisualStates()
7171

7272
private void OmnibarMode_PointerEntered(object sender, PointerRoutedEventArgs e)
7373
{
74-
if (Host!.CurrentActiveMode == this)
74+
if (Host!.CurrentSelectedMode == this)
7575
return;
7676

7777
_isHoveredOver = true;
@@ -81,7 +81,7 @@ private void OmnibarMode_PointerEntered(object sender, PointerRoutedEventArgs e)
8181

8282
private void OmnibarMode_PointerPressed(object sender, PointerRoutedEventArgs e)
8383
{
84-
if (Host!.CurrentActiveMode == this)
84+
if (Host!.CurrentSelectedMode == this)
8585
return;
8686

8787
_isHoveredOver = false;
@@ -91,7 +91,7 @@ private void OmnibarMode_PointerPressed(object sender, PointerRoutedEventArgs e)
9191

9292
private void OmnibarMode_PointerReleased(object sender, PointerRoutedEventArgs e)
9393
{
94-
if (Host!.CurrentActiveMode == this)
94+
if (Host!.CurrentSelectedMode == this)
9595
return;
9696

9797
_isHoveredOver = true;

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

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
<controls:SamplePanel Header="Default usage">
1616
<controls:SamplePanel.MainContent>
17-
<controls:Omnibar HorizontalAlignment="Stretch" VerticalAlignment="Center">
17+
<controls:Omnibar x:Name="Omnibar1" IsEnabled="{x:Bind Omnibar1IsEnableToggleSwitch.IsOn, Mode=OneWay}">
1818

1919
<controls:OmnibarMode
2020
IsDefault="True"
@@ -107,6 +107,18 @@
107107

108108
</controls:Omnibar>
109109
</controls:SamplePanel.MainContent>
110+
<controls:SamplePanel.SideContent>
111+
<StackPanel Spacing="8">
112+
<ToggleSwitch
113+
x:Name="Omnibar1IsEnableToggleSwitch"
114+
Header="Enable/disable Omnibar:"
115+
IsOn="True" />
116+
<TextBox
117+
Header="Current selected mode:"
118+
IsReadOnly="True"
119+
Text="{x:Bind Omnibar1.CurrentSelectedMode, Mode=OneWay}" />
120+
</StackPanel>
121+
</controls:SamplePanel.SideContent>
110122
</controls:SamplePanel>
111123

112124
</StackPanel>

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

Lines changed: 31 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -304,47 +304,11 @@
304304
<!-- Toggled usages -->
305305
<controls:SamplePanel Header="Toggled usages">
306306
<controls:SamplePanel.MainContent>
307-
<Grid ColumnSpacing="24" RowSpacing="24">
308-
<Grid.RowDefinitions>
309-
<RowDefinition />
310-
<RowDefinition />
311-
<RowDefinition />
312-
<RowDefinition />
313-
</Grid.RowDefinitions>
314-
<Grid.ColumnDefinitions>
315-
<ColumnDefinition Width="Auto" />
316-
<ColumnDefinition Width="*" />
317-
</Grid.ColumnDefinitions>
307+
<StackPanel Spacing="12">
318308

319-
<!-- Grid Row Headers -->
320-
<TextBlock
321-
Grid.Row="0"
322-
Grid.Column="0"
323-
VerticalAlignment="Center"
324-
Text="HighContrast Manual Toggle" />
309+
<TextBlock Text="HighContrast Manual Toggle:" />
325310

326-
<TextBlock
327-
Grid.Row="1"
328-
Grid.Column="0"
329-
VerticalAlignment="Center"
330-
Text="ToggleBehavior On" />
331-
332-
<TextBlock
333-
Grid.Row="2"
334-
Grid.Column="0"
335-
VerticalAlignment="Center"
336-
Text="ToggleBahvior On + Disabled" />
337-
338-
<TextBlock
339-
Grid.Row="3"
340-
Grid.Column="0"
341-
VerticalAlignment="Center"
342-
Text="IsFilled" />
343-
344-
<!-- High Contrast Row 0 -->
345311
<StackPanel
346-
Grid.Row="0"
347-
Grid.Column="1"
348312
Padding="8"
349313
Orientation="Horizontal"
350314
Spacing="16">
@@ -362,10 +326,9 @@
362326
Style="{StaticResource IconTest}" />
363327
</StackPanel>
364328

365-
<!-- ToggleBehavior On Row 1 -->
329+
<TextBlock Text="ToggleBehavior On:" />
330+
366331
<StackPanel
367-
Grid.Row="1"
368-
Grid.Column="1"
369332
Padding="8"
370333
HorizontalAlignment="Left"
371334
Background="{ThemeResource ToggleBackground}"
@@ -386,10 +349,9 @@
386349
ToggleBehavior="On" />
387350
</StackPanel>
388351

389-
<!-- ToggleBehavior On + Disabled Row 2 -->
352+
<TextBlock Text="ToggleBahvior On + Disabled:" />
353+
390354
<StackPanel
391-
Grid.Row="2"
392-
Grid.Column="1"
393355
Padding="8"
394356
HorizontalAlignment="Left"
395357
Background="{ThemeResource ToggleDisabledBackground}"
@@ -413,37 +375,35 @@
413375
ToggleBehavior="On" />
414376
</StackPanel>
415377

416-
<!-- IsFilled 3 -->
378+
<TextBlock Text="IsFilled:" />
379+
417380
<StackPanel
418-
Grid.Row="3"
419-
Grid.Column="1"
420381
Padding="8"
421382
Orientation="Horizontal"
422383
Spacing="16">
423384
<controls:ThemedIcon
424385
IconType="Layered"
425386
IsFilled="{x:Bind FilledToggle.IsOn, Mode=TwoWay}"
426387
Style="{StaticResource IconTest}" />
427-
428388
<controls:ThemedIcon
429389
IconType="Outline"
430390
IsFilled="{x:Bind FilledToggle.IsOn, Mode=TwoWay}"
431391
Style="{StaticResource IconTest}" />
432392
</StackPanel>
433393

434-
</Grid>
394+
</StackPanel>
435395
</controls:SamplePanel.MainContent>
436396
<controls:SamplePanel.SideContent>
437-
<StackPanel>
397+
<StackPanel Spacing="8">
438398

439399
<ToggleSwitch
440400
x:Name="ContrastToggle"
441-
Header="High Contrast"
401+
Header="High Contrast:"
442402
IsOn="True" />
443403

444404
<ToggleSwitch
445405
x:Name="FilledToggle"
446-
Header="Toggle IsFilled"
406+
Header="Toggle IsFilled:"
447407
IsOn="True"
448408
OffContent="Default"
449409
OnContent="Filled" />
@@ -455,38 +415,13 @@
455415
<!-- ToggleBehaviour Auto -->
456416
<controls:SamplePanel Header="ToggleBehaviour Auto">
457417
<controls:SamplePanel.MainContent>
458-
<Grid ColumnSpacing="24" RowSpacing="24">
459-
<Grid.RowDefinitions>
460-
<RowDefinition />
461-
<RowDefinition />
462-
<RowDefinition />
463-
</Grid.RowDefinitions>
464-
<Grid.ColumnDefinitions>
465-
<ColumnDefinition Width="Auto" />
466-
<ColumnDefinition Width="*" />
467-
</Grid.ColumnDefinitions>
418+
<StackPanel Spacing="12">
468419

469420
<!-- Grid Row Headers -->
470421

471-
<TextBlock
472-
Grid.Row="0"
473-
Grid.Column="0"
474-
VerticalAlignment="Center"
475-
Text="In ToggleButtons" />
476-
477-
<TextBlock
478-
Grid.Row="1"
479-
Grid.RowSpan="2"
480-
Grid.Column="0"
481-
VerticalAlignment="Center"
482-
Text="In AppBarToggleButtons" />
422+
<TextBlock Text="In ToggleButtons:" />
483423

484-
<!-- In ToggleButtons Row 0 -->
485-
<StackPanel
486-
Grid.Row="0"
487-
Grid.Column="1"
488-
Orientation="Horizontal"
489-
Spacing="16">
424+
<StackPanel Orientation="Horizontal" Spacing="16">
490425
<ToggleButton
491426
Padding="8"
492427
AutomationProperties.Name="TestToggleButton1"
@@ -526,12 +461,9 @@
526461
</ToggleButton>
527462
</StackPanel>
528463

529-
<!-- In AppBarToggleButtons Row 1 and 2 -->
530-
<StackPanel
531-
Grid.Row="1"
532-
Grid.Column="1"
533-
Orientation="Horizontal"
534-
Spacing="16">
464+
<TextBlock Text="In AppBarToggleButtons:" />
465+
466+
<StackPanel Orientation="Horizontal" Spacing="16">
535467
<AppBarButton
536468
AutomationProperties.Name="TestAppBarToggle0-1"
537469
HighContrastAdjustment="None"
@@ -578,11 +510,7 @@
578510
</AppBarToggleButton>
579511
</StackPanel>
580512

581-
<StackPanel
582-
Grid.Row="2"
583-
Grid.Column="1"
584-
Orientation="Horizontal"
585-
Spacing="16">
513+
<StackPanel Orientation="Horizontal" Spacing="16">
586514
<AppBarButton
587515
AutomationProperties.Name="TestAppBarToggle1-1"
588516
HighContrastAdjustment="None"
@@ -628,7 +556,7 @@
628556
</AppBarToggleButton>
629557
</StackPanel>
630558

631-
</Grid>
559+
</StackPanel>
632560
</controls:SamplePanel.MainContent>
633561
<controls:SamplePanel.SideContent>
634562
<StackPanel>
@@ -652,37 +580,11 @@
652580
<!-- ToggleBehaviour Off -->
653581
<controls:SamplePanel Header="ToggleBehaviour Off">
654582
<controls:SamplePanel.MainContent>
655-
<Grid ColumnSpacing="24" RowSpacing="24">
656-
<Grid.RowDefinitions>
657-
<RowDefinition />
658-
<RowDefinition />
659-
<RowDefinition />
660-
</Grid.RowDefinitions>
661-
<Grid.ColumnDefinitions>
662-
<ColumnDefinition Width="Auto" />
663-
<ColumnDefinition Width="*" />
664-
</Grid.ColumnDefinitions>
583+
<StackPanel Spacing="12">
665584

666-
<!-- Grid Row Headers -->
667-
<TextBlock
668-
Grid.Row="0"
669-
Grid.Column="0"
670-
VerticalAlignment="Center"
671-
Text="In ToggleButtons" />
672-
673-
<TextBlock
674-
Grid.Row="1"
675-
Grid.RowSpan="2"
676-
Grid.Column="0"
677-
VerticalAlignment="Center"
678-
Text="In AppBarToggleButtons" />
585+
<TextBlock Text="In ToggleButtons:" />
679586

680-
<!-- In ToggleButtons Row 0 -->
681-
<StackPanel
682-
Grid.Row="0"
683-
Grid.Column="1"
684-
Orientation="Horizontal"
685-
Spacing="16">
587+
<StackPanel Orientation="Horizontal" Spacing="16">
686588
<ToggleButton
687589
Padding="8"
688590
AutomationProperties.Name="TestToggle1-Off"
@@ -722,12 +624,9 @@
722624
</ToggleButton>
723625
</StackPanel>
724626

725-
<!-- In AppBarToggleButtons Row 1 and 2 -->
726-
<StackPanel
727-
Grid.Row="1"
728-
Grid.Column="1"
729-
Orientation="Horizontal"
730-
Spacing="16">
627+
<TextBlock Text="In AppBarToggleButtons:" />
628+
629+
<StackPanel Orientation="Horizontal" Spacing="16">
731630
<AppBarButton
732631
AutomationProperties.Name="TestAppBarToggle2-1"
733632
HighContrastAdjustment="None"
@@ -847,10 +746,10 @@
847746
</AppBarToggleButton>
848747
</StackPanel>
849748

850-
</Grid>
749+
</StackPanel>
851750
</controls:SamplePanel.MainContent>
852751
<controls:SamplePanel.SideContent>
853-
<StackPanel>
752+
<StackPanel Spacing="12">
854753

855754
<ToggleSwitch
856755
x:Name="OffTestToggleSwitch"
@@ -879,9 +778,9 @@
879778
</Grid.RowDefinitions>
880779

881780
<Grid.ColumnDefinitions>
882-
<ColumnDefinition />
883-
<ColumnDefinition />
884-
<ColumnDefinition />
781+
<ColumnDefinition Width="90" />
782+
<ColumnDefinition Width="90" />
783+
<ColumnDefinition Width="90" />
885784
</Grid.ColumnDefinitions>
886785

887786
<!-- Row 0 -->

0 commit comments

Comments
 (0)