mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-08 04:07:40 +02:00
[Launcher] Fluent UX fixes for the results list (#2427)
* Fixed right margin * Fixed issue where the background of the gridview would light up on pointerover. * Fixed issue where application title/path run through command buttons. Centrally aligned image/icon. * Updated the shadow so it looks more like a UWP ThemeShadow.
This commit is contained in:
@@ -13,11 +13,40 @@
|
|||||||
d:DesignWidth="720">
|
d:DesignWidth="720">
|
||||||
<UserControl.Resources>
|
<UserControl.Resources>
|
||||||
<converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
|
<converters:BoolToObjectConverter x:Key="BoolToVisibilityConverter" TrueValue="Visible" FalseValue="Collapsed"/>
|
||||||
|
<Style x:Key="CommandButtonGridViewItemContainerStyle" TargetType="GridViewItem">
|
||||||
|
<Setter Property="Background" Value="Transparent"/>
|
||||||
|
<Setter Property="Margin" Value="0,0,0,0"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="GridViewItem">
|
||||||
|
<ListViewItemPresenter x:Name="Root" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}">
|
||||||
|
<VisualStateManager.VisualStateGroups>
|
||||||
|
<VisualStateGroup x:Name="CommonStates">
|
||||||
|
<VisualState x:Name="Normal"/>
|
||||||
|
<VisualState x:Name="Selected"/>
|
||||||
|
<VisualState x:Name="PointerOver"/>
|
||||||
|
<VisualState x:Name="PointerOverSelected"/>
|
||||||
|
<VisualState x:Name="PointerOverPressed"/>
|
||||||
|
<VisualState x:Name="Pressed"/>
|
||||||
|
<VisualState x:Name="PressedSelected"/>
|
||||||
|
</VisualStateGroup>
|
||||||
|
<VisualStateGroup x:Name="DisabledStates">
|
||||||
|
<VisualState x:Name="Enabled"/>
|
||||||
|
<VisualState x:Name="Disabled"/>
|
||||||
|
</VisualStateGroup>
|
||||||
|
</VisualStateManager.VisualStateGroups>
|
||||||
|
</ListViewItemPresenter>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
</UserControl.Resources>
|
</UserControl.Resources>
|
||||||
|
|
||||||
<Grid
|
<Grid
|
||||||
x:Name="PowerBar"
|
x:Name="PowerBar"
|
||||||
Background="{ThemeResource BackdropAcrylicBrush}"
|
Background="{ThemeResource BackdropAcrylicBrush}"
|
||||||
VerticalAlignment="Top">
|
VerticalAlignment="Top">
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
x:Name="SuggestionsList"
|
x:Name="SuggestionsList"
|
||||||
x:FieldModifier="public"
|
x:FieldModifier="public"
|
||||||
@@ -46,21 +75,23 @@
|
|||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="64" />
|
<ColumnDefinition Width="64" />
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
<Grid.RowDefinitions >
|
<Grid.RowDefinitions >
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
<RowDefinition Height="*"/>
|
<RowDefinition Height="*"/>
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
<Image x:Name="AppIcon" Height="36" Margin="8,0,0,0" Grid.RowSpan="2" HorizontalAlignment="Left" Source="{Binding Image}" />
|
<Image x:Name="AppIcon" Height="36" Grid.RowSpan="2" Margin="-8,0,0,0" HorizontalAlignment="Center" Source="{Binding Image}" />
|
||||||
<TextBlock x:Name="Title" Grid.Column="1" Text="{Binding Result.Title}" FontWeight="SemiBold" FontSize="20" VerticalAlignment="Bottom"/>
|
<TextBlock x:Name="Title" Grid.Column="1" Text="{Binding Result.Title}" FontWeight="SemiBold" FontSize="20" Margin="0,0,0,-2" VerticalAlignment="Bottom"/>
|
||||||
<TextBlock x:Name="Path" Grid.Column="1" Text= "{Binding Result.SubTitle}" Grid.Row="1" Opacity="0.6" VerticalAlignment="Top"/>
|
<TextBlock x:Name="Path" Grid.Column="1" Text= "{Binding Result.SubTitle}" Grid.Row="1" Opacity="0.6" Margin="0,2,0,0" VerticalAlignment="Top"/>
|
||||||
<GridView
|
<GridView
|
||||||
|
ItemContainerStyle="{StaticResource CommandButtonGridViewItemContainerStyle}"
|
||||||
HorizontalAlignment="Right"
|
HorizontalAlignment="Right"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
Grid.RowSpan="2"
|
Grid.RowSpan="2"
|
||||||
Grid.Column="1"
|
Grid.Column="2"
|
||||||
Margin="0,0,42,0"
|
Margin="8,0,17,0"
|
||||||
Height="46"
|
Height="46"
|
||||||
Visibility="{Binding AreContextButtonsActive, Converter={StaticResource BoolToVisibilityConverter}}"
|
Visibility="{Binding AreContextButtonsActive, Converter={StaticResource BoolToVisibilityConverter}}"
|
||||||
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
ScrollViewer.VerticalScrollBarVisibility="Disabled"
|
||||||
@@ -70,7 +101,7 @@
|
|||||||
SelectedIndex="{Binding ContextMenuSelectedIndex}">
|
SelectedIndex="{Binding ContextMenuSelectedIndex}">
|
||||||
<GridView.ItemTemplate>
|
<GridView.ItemTemplate>
|
||||||
<DataTemplate>
|
<DataTemplate>
|
||||||
<Button Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource ButtonRevealStyle}">
|
<Button Command="{Binding Command}" VerticalAlignment="Center" CornerRadius="4" Height="42" Width="42" BorderThickness="1" Style="{ThemeResource IconOnlyButton}">
|
||||||
<ToolTipService.ToolTip>
|
<ToolTipService.ToolTip>
|
||||||
<TextBlock Text="{Binding Title}"/>
|
<TextBlock Text="{Binding Title}"/>
|
||||||
</ToolTipService.ToolTip>
|
</ToolTipService.ToolTip>
|
||||||
|
|||||||
@@ -33,11 +33,11 @@
|
|||||||
<Border
|
<Border
|
||||||
x:Name="SearchBoxBorder"
|
x:Name="SearchBoxBorder"
|
||||||
Grid.Row="0"
|
Grid.Row="0"
|
||||||
Margin="8"
|
Margin="24,24,24,8"
|
||||||
BorderThickness="4"
|
BorderThickness="4"
|
||||||
CornerRadius="4">
|
CornerRadius="4">
|
||||||
<Border.Effect>
|
<Border.Effect>
|
||||||
<DropShadowEffect BlurRadius="12" Opacity="0.4" ShadowDepth="4" />
|
<DropShadowEffect BlurRadius="12" Opacity="0.4" ShadowDepth="0" />
|
||||||
</Border.Effect>
|
</Border.Effect>
|
||||||
<xaml:WindowsXamlHost
|
<xaml:WindowsXamlHost
|
||||||
InitialTypeName="PowerLauncher.UI.LauncherControl"
|
InitialTypeName="PowerLauncher.UI.LauncherControl"
|
||||||
@@ -46,12 +46,12 @@
|
|||||||
<Border
|
<Border
|
||||||
x:Name="ListBoxBorder"
|
x:Name="ListBoxBorder"
|
||||||
Grid.Row="1"
|
Grid.Row="1"
|
||||||
Margin="8"
|
Margin="24,8,24,24"
|
||||||
BorderThickness="4"
|
BorderThickness="4"
|
||||||
CornerRadius="4"
|
CornerRadius="4"
|
||||||
Visibility="{Binding Results.Visbility}">
|
Visibility="{Binding Results.Visbility}">
|
||||||
<Border.Effect>
|
<Border.Effect>
|
||||||
<DropShadowEffect BlurRadius="12" Opacity="0.4" ShadowDepth="4" />
|
<DropShadowEffect BlurRadius="12" Opacity="0.4" ShadowDepth="0" />
|
||||||
</Border.Effect>
|
</Border.Effect>
|
||||||
<xaml:WindowsXamlHost
|
<xaml:WindowsXamlHost
|
||||||
InitialTypeName="PowerLauncher.UI.ResultList"
|
InitialTypeName="PowerLauncher.UI.ResultList"
|
||||||
|
|||||||
Reference in New Issue
Block a user