Skip to content
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.

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

Fix: Fixed issue where content on the search results page wasn't centered #10570

Merged
merged 16 commits into from
Jan 17, 2023
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
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
2 changes: 1 addition & 1 deletion src/Files.App/Strings/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -1645,7 +1645,7 @@
<value>Didn't find what you're looking for?</value>
</data>
<data name="SearchUnindexedItemsButton.Content" xml:space="preserve">
<value>Search unindexed items.</value>
<value>Search unindexed items</value>
</data>
<data name="SettingsAppearanceOpenThemesFolderButton.Content" xml:space="preserve">
<value>Open themes folder</value>
Expand Down
29 changes: 15 additions & 14 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,21 @@
Canvas.ZIndex="0"
EmptyTextType="{x:Bind ParentShellPageInstance.FilesystemViewModel.EmptyTextType, Mode=OneWay}" />

<StackPanel
x:Name="SearchUnindexedItemsPanel"
HorizontalAlignment="Center"
VerticalAlignment="Bottom"
x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}"
Orientation="Vertical">
<TextBlock Visibility="Visible" Text="{helpers:ResourceString Name=SearchUnindexedItemsLabel/Text}" />
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
<HyperlinkButton
x:Name="SearchUnindexedItemsButton"
HorizontalAlignment="Center"
Visibility="Visible"
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
Command="{x:Bind CommandsViewModel.SearchUnindexedItems}"
Content="{helpers:ResourceString Name=SearchUnindexedItemsButton/Content}" />
</StackPanel>

<TeachingTip
x:Name="FileNameTeachingTip"
CloseButtonContent="{helpers:ResourceString Name=FileNameTeachingTip/CloseButtonContent}"
Expand Down Expand Up @@ -877,20 +892,6 @@
<ItemsStackPanel AreStickyGroupHeadersEnabled="False" Orientation="Vertical" />
</ItemsPanelTemplate>
</ListView.ItemsPanel>
<ListView.Footer>
<StackPanel
x:Name="SearchUnindexedItemsPanel"
HorizontalAlignment="Stretch"
x:Load="{x:Bind InstanceViewModel.ShowSearchUnindexedItemsMessage, Mode=OneWay}"
Orientation="Vertical">
<TextBlock HorizontalTextAlignment="Center" Text="{helpers:ResourceString Name=SearchUnindexedItemsLabel/Text}" />
<HyperlinkButton
x:Name="SearchUnindexedItemsButton"
HorizontalAlignment="Center"
Command="{x:Bind CommandsViewModel.SearchUnindexedItems}"
Content="{helpers:ResourceString Name=SearchUnindexedItemsButton/Content}" />
</StackPanel>
</ListView.Footer>
</ListView>
</SemanticZoom.ZoomedInView>

Expand Down