Skip to content

Commit 159cb4e

Browse files
0x5bfa0x5bfa
committed
Update
1 parent 5cc35de commit 159cb4e

File tree

4 files changed

+91
-7
lines changed

4 files changed

+91
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public partial class OmnibarMode
2121
public partial string? TextPlaceholder { get; set; }
2222

2323
[GeneratedDependencyProperty]
24-
public partial string? ToolTip { get; set; }
24+
public partial string? ModeName { get; set; }
2525

2626
[GeneratedDependencyProperty]
2727
public partial FrameworkElement? ContentOnInactive { get; set; }

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ private void UpdateVisualStates()
6767
true);
6868
}
6969

70+
public override string ToString()
71+
{
72+
return ModeName ?? "";
73+
}
74+
7075
// Events
7176

7277
private void OmnibarMode_PointerEntered(object sender, PointerRoutedEventArgs e)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
Height="{TemplateBinding Height}"
4242
Background="Transparent"
4343
CornerRadius="{TemplateBinding CornerRadius}"
44-
ToolTipService.ToolTip="{Binding ToolTip, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
44+
ToolTipService.ToolTip="{Binding ModeName, RelativeSource={RelativeSource TemplatedParent}, Mode=OneWay}">
4545
<Border.BackgroundTransition>
4646
<BrushTransition Duration="0:0:0.083" />
4747
</Border.BackgroundTransition>

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

Lines changed: 84 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
<controls:OmnibarMode
2020
IsDefault="True"
21+
ModeName="Path"
2122
Text="Path..."
22-
TextPlaceholder="Enter text..."
23-
ToolTip="Path">
23+
TextPlaceholder="Enter text...">
2424
<controls:OmnibarMode.IconOnActive>
2525
<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Path}" />
2626
</controls:OmnibarMode.IconOnActive>
@@ -52,9 +52,9 @@
5252
</controls:OmnibarMode>
5353

5454
<controls:OmnibarMode
55+
ModeName="Palette"
5556
SuggestionItemsSource="{x:Bind DummyItems1, Mode=OneWay}"
56-
TextPlaceholder="Enter a palette command..."
57-
ToolTip="Palette">
57+
TextPlaceholder="Enter a palette command...">
5858
<controls:OmnibarMode.IconOnActive>
5959
<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Commands}" />
6060
</controls:OmnibarMode.IconOnActive>
@@ -96,7 +96,7 @@
9696
</controls:OmnibarMode.SuggestionItemTemplate>
9797
</controls:OmnibarMode>
9898

99-
<controls:OmnibarMode TextPlaceholder="Enter a search query..." ToolTip="Search">
99+
<controls:OmnibarMode ModeName="Search" TextPlaceholder="Enter a search query...">
100100
<controls:OmnibarMode.IconOnActive>
101101
<controls:ThemedIcon IsFilled="True" Style="{StaticResource App.ThemedIcons.Omnibar.Search}" />
102102
</controls:OmnibarMode.IconOnActive>
@@ -121,5 +121,84 @@
121121
</controls:SamplePanel.SideContent>
122122
</controls:SamplePanel>
123123

124+
<controls:SamplePanel Header="Custom usage">
125+
<controls:SamplePanel.MainContent>
126+
<StackPanel Spacing="12">
127+
128+
<TextBlock Text="Using WinUI font glyphs:" />
129+
130+
<controls:Omnibar x:Name="Omnibar2" IsEnabled="{x:Bind Omnibar2IsEnableToggleSwitch.IsOn, Mode=OneWay}">
131+
132+
<controls:OmnibarMode
133+
IsDefault="True"
134+
ModeName="Path"
135+
Text="Path..."
136+
TextPlaceholder="Enter text...">
137+
<controls:OmnibarMode.IconOnActive>
138+
<FontIcon FontSize="14" Glyph="&#xE713;" />
139+
</controls:OmnibarMode.IconOnActive>
140+
<controls:OmnibarMode.IconOnInactive>
141+
<FontIcon FontSize="14" Glyph="&#xE713;" />
142+
</controls:OmnibarMode.IconOnInactive>
143+
<controls:OmnibarMode.ContentOnInactive>
144+
<Grid Padding="16,0" ColumnSpacing="16">
145+
<Grid.ColumnDefinitions>
146+
<ColumnDefinition Width="Auto" />
147+
<ColumnDefinition Width="*" />
148+
<ColumnDefinition Width="Auto" />
149+
</Grid.ColumnDefinitions>
150+
<Image
151+
Grid.Column="0"
152+
Width="16"
153+
Height="16"
154+
Source="/Data/DummyIcon1.png" />
155+
<TextBlock
156+
Grid.Column="1"
157+
VerticalAlignment="Center"
158+
Text="Breadcrumb goes here" />
159+
<FontIcon
160+
Grid.Column="2"
161+
FontSize="14"
162+
Glyph="&#xe70d;" />
163+
</Grid>
164+
</controls:OmnibarMode.ContentOnInactive>
165+
</controls:OmnibarMode>
166+
167+
<controls:OmnibarMode ModeName="Palette" TextPlaceholder="Enter a palette command...">
168+
<controls:OmnibarMode.IconOnActive>
169+
<FontIcon FontSize="14" Glyph="&#xE713;" />
170+
</controls:OmnibarMode.IconOnActive>
171+
<controls:OmnibarMode.IconOnInactive>
172+
<FontIcon FontSize="14" Glyph="&#xE713;" />
173+
</controls:OmnibarMode.IconOnInactive>
174+
</controls:OmnibarMode>
175+
176+
<controls:OmnibarMode ModeName="Search" TextPlaceholder="Enter a search query...">
177+
<controls:OmnibarMode.IconOnActive>
178+
<FontIcon FontSize="14" Glyph="&#xE713;" />
179+
</controls:OmnibarMode.IconOnActive>
180+
<controls:OmnibarMode.IconOnInactive>
181+
<FontIcon FontSize="14" Glyph="&#xE713;" />
182+
</controls:OmnibarMode.IconOnInactive>
183+
</controls:OmnibarMode>
184+
185+
</controls:Omnibar>
186+
187+
</StackPanel>
188+
</controls:SamplePanel.MainContent>
189+
<controls:SamplePanel.SideContent>
190+
<StackPanel Spacing="12">
191+
<ToggleSwitch
192+
x:Name="Omnibar2IsEnableToggleSwitch"
193+
Header="Enable/disable Omnibar:"
194+
IsOn="True" />
195+
<TextBox
196+
Header="Current selected mode:"
197+
IsReadOnly="True"
198+
Text="{x:Bind Omnibar2.CurrentSelectedMode, Mode=OneWay}" />
199+
</StackPanel>
200+
</controls:SamplePanel.SideContent>
201+
</controls:SamplePanel>
202+
124203
</StackPanel>
125204
</Page>

0 commit comments

Comments
 (0)