mirror of
https://github.com/microsoft/PowerToys.git
synced 2024-11-24 04:12:32 +08:00
[Run] Fixing UI issues (#8681)
* UI fixes * Added dlls to installer * Accent color tweaks + sync * Added cornerradius to selection highlight border * Increase icon's radius Co-authored-by: Enrico Giordani <enrico.giordani@gmail.com>
This commit is contained in:
Niels Laute
GitHub
parent
3a87c4909c
commit
17b40aa10a
@ -889,7 +889,7 @@
|
||||
</RegistryKey>
|
||||
|
||||
<File Source="$(var.BinX64Dir)modules\Launcher\Microsoft.Launcher.dll" />
|
||||
<?foreach File in concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;Mages.Core.dll;Microsoft.Search.Interop.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;NLog.dll;NLog.Extensions.Logging.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;System.Text.Json.dll;PowerLauncher.runtimeconfig.json;System.Data.OleDb.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToysInterop.dll;ManagedTelemetry.dll;PowerLauncher.Telemetry.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;ControlzEx.dll;ManagedCommon.dll;System.IO.Abstractions.dll;Microsoft.PowerToys.Common.UI.dll;System.ServiceProcess.ServiceController.dll;Microsoft.Toolkit.Uwp.Notifications.dll?>
|
||||
<?foreach File in concrt140_app.dll;ICSharpCode.SharpZipLib.dll;JetBrains.Annotations.dll;Mages.Core.dll;Microsoft.Search.Interop.dll;Mono.Cecil.dll;Mono.Cecil.Mdb.dll;Mono.Cecil.Pdb.dll;Mono.Cecil.Rocks.dll;msvcp140_1_app.dll;msvcp140_2_app.dll;msvcp140_app.dll;Newtonsoft.Json.dll;NLog.dll;NLog.Extensions.Logging.dll;PowerLauncher.deps.json;PowerLauncher.dll;PowerLauncher.exe;Microsoft.Xaml.Behaviors.dll;System.Text.Json.dll;PowerLauncher.runtimeconfig.json;System.Data.OleDb.dll;vcamp140_app.dll;vccorlib140_app.dll;vcomp140_app.dll;vcruntime140_1_app.dll;vcruntime140_app.dll;Wox.Infrastructure.dll;Wox.Plugin.dll;PowerToysInterop.dll;ManagedTelemetry.dll;PowerLauncher.Telemetry.dll;Microsoft.Extensions.Configuration.Abstractions.dll;Microsoft.Extensions.Configuration.Binder.dll;Microsoft.Extensions.Configuration.dll;Microsoft.Extensions.DependencyInjection.Abstractions.dll;Microsoft.Extensions.DependencyInjection.dll;Microsoft.Extensions.Logging.Abstractions.dll;Microsoft.Extensions.Logging.dll;Microsoft.Extensions.Options.dll;Microsoft.Extensions.Primitives.dll;ControlzEx.dll;ManagedCommon.dll;System.IO.Abstractions.dll;Microsoft.PowerToys.Common.UI.dll;System.ServiceProcess.ServiceController.dll;Microsoft.Toolkit.Uwp.Notifications.dll;ModernWpf.Controls.dll;ModernWpf.dll?>
|
||||
<File Id="File_$(var.File)" Source="$(var.BinX64Dir)modules\launcher\$(var.File)" />
|
||||
<?endforeach?>
|
||||
<File Source="$(var.BinX64Dir)SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Lib.dll" />
|
||||
|
||||
@ -634,7 +634,7 @@ namespace Microsoft.Plugin.Program.Programs
|
||||
var brush = new SolidColorBrush(color);
|
||||
var pen = new Pen(brush, 1);
|
||||
var backgroundArea = new Rect(0, 0, width, height);
|
||||
var rectangleGeometry = new RectangleGeometry(backgroundArea);
|
||||
var rectangleGeometry = new RectangleGeometry(backgroundArea, 8, 8);
|
||||
var rectDrawing = new GeometryDrawing(brush, pen, rectangleGeometry);
|
||||
group.Children.Add(rectDrawing);
|
||||
|
||||
|
||||
@ -2,13 +2,15 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:theming="clr-namespace:Microsoft.PowerToys.Common.UI;assembly=Microsoft.PowerToys.Common.UI"
|
||||
xmlns:ui="http://schemas.modernwpf.com/2019"
|
||||
ShutdownMode="OnMainWindowClose"
|
||||
Startup="OnStartup">
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
<theming:CustomLibraryThemeProvider x:Key="{x:Static theming:CustomLibraryThemeProvider.DefaultInstance}" />
|
||||
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ui:ThemeResources />
|
||||
<ui:XamlControlsResources />
|
||||
<ResourceDictionary Source="pack://application:,,,/Themes/Dark.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
|
||||
@ -102,6 +102,7 @@
|
||||
</PackageReference>
|
||||
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="6.1.1" />
|
||||
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.19" />
|
||||
<PackageReference Include="ModernWpfUI" Version="0.9.2" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="NuGet.CommandLine" Version="5.7.0">
|
||||
<PrivateAssets>all</PrivateAssets>
|
||||
|
||||
@ -4,24 +4,20 @@
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:p="clr-namespace:PowerLauncher.Properties"
|
||||
xmlns:ui="http://schemas.modernwpf.com/2019"
|
||||
mc:Ignorable="d"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="{DynamicResource SystemChromeLow}"
|
||||
Icon="Images/app_error.dark.png"
|
||||
Topmost="True"
|
||||
ui:WindowHelper.UseModernWindowStyle="True"
|
||||
ResizeMode="NoResize"
|
||||
Width="760"
|
||||
Height="560"
|
||||
Title="{x:Static p:Resources.reportWindow_wox_got_an_error}"
|
||||
d:DesignHeight="300" d:DesignWidth="600" x:ClassModifier="internal">
|
||||
<Window.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/Styles/ModernScrollBarStyle.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
</ResourceDictionary>
|
||||
</Window.Resources>
|
||||
<Grid Margin="24">
|
||||
d:DesignHeight="300"
|
||||
d:DesignWidth="600"
|
||||
x:ClassModifier="internal">
|
||||
<Grid Margin="12">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="64"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
@ -54,17 +50,15 @@
|
||||
BorderThickness="0"
|
||||
Grid.Row="2"
|
||||
x:Name="LogFilePathBox"
|
||||
Margin="0,16,0,0"
|
||||
Margin="-8,16,-8,16"
|
||||
FontSize="14"
|
||||
FontFamily="Consolas"
|
||||
Foreground="{DynamicResource ControlTextBrushKey}"
|
||||
IsReadOnly="True"
|
||||
TextWrapping="Wrap">
|
||||
</TextBox>
|
||||
TextWrapping="Wrap"/>
|
||||
|
||||
<RichTextBox x:Name="ErrorTextbox"
|
||||
Grid.Row="3"
|
||||
BorderBrush="{DynamicResource ScrollBarThumbBackground}"
|
||||
BorderThickness="1"
|
||||
Background="Transparent"
|
||||
IsDocumentEnabled="True"
|
||||
|
||||
@ -12,9 +12,6 @@
|
||||
|
||||
<UserControl.Resources>
|
||||
<ResourceDictionary>
|
||||
<ResourceDictionary.MergedDictionaries>
|
||||
<ResourceDictionary Source="pack://application:,,,/Styles/ModernScrollBarStyle.xaml" />
|
||||
</ResourceDictionary.MergedDictionaries>
|
||||
|
||||
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
|
||||
<Style x:Key="FocusVisual">
|
||||
@ -89,6 +86,7 @@
|
||||
<Grid Background="Transparent">
|
||||
<Border x:Name="HighlightBorder"
|
||||
BorderThickness="0"
|
||||
CornerRadius="4"
|
||||
Background="{DynamicResource SystemChromeLow}"
|
||||
BorderBrush="Transparent"
|
||||
SnapsToDevicePixels="true"/>
|
||||
@ -99,15 +97,11 @@
|
||||
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||
</Grid>
|
||||
<ControlTemplate.Triggers>
|
||||
<!-- Setting the opacity of the highlight border to improve the contrast of the AccentColorbrush when selected. In UWP we could call a different brush, in WPF we need to play with the opacity of the WindowGlassBrush-->
|
||||
<Trigger Property="IsMouseOver" Value="True">
|
||||
<Setter Property="Opacity" TargetName="HighlightBorder" Value="1" />
|
||||
<Setter Property="Background" TargetName="HighlightBorder" Value="{DynamicResource ListViewItemBackgroundPointerOver}"/>
|
||||
</Trigger>
|
||||
<Trigger Property="IsSelected" Value="True">
|
||||
<Setter Property="Opacity" TargetName="HighlightBorder" Value="0.4" />
|
||||
<Setter Property="Background" TargetName="HighlightBorder" Value="{Binding Source={x:Static SystemParameters.WindowGlassBrush}}"/>
|
||||
<!-- Accent color brush -->
|
||||
<Setter Property="Background" TargetName="HighlightBorder" Value="{DynamicResource SystemControlHighlightListAccentLowBrush}" />
|
||||
</Trigger>
|
||||
</ControlTemplate.Triggers>
|
||||
</ControlTemplate>
|
||||
@ -150,41 +144,16 @@
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
<Style x:Key="CollapsableTextblock" TargetType="TextBlock">
|
||||
<Style x:Key="CollapsableTextblock"
|
||||
TargetType="TextBlock">
|
||||
<Style.Triggers>
|
||||
<Trigger Property="Text" Value="">
|
||||
<Setter Property="Visibility" Value="Collapsed"/>
|
||||
<Trigger Property="Text"
|
||||
Value="">
|
||||
<Setter Property="Visibility"
|
||||
Value="Collapsed" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="{x:Type ToolTip}" >
|
||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
||||
<Setter Property="HasDropShadow" Value="True" />
|
||||
<Setter Property="FontSize" Value="12" />
|
||||
<Setter Property="Placement" Value="Bottom" />
|
||||
<Setter Property="VerticalOffset" Value="0" />
|
||||
<Setter Property="Padding" Value="8" />
|
||||
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ToolTip}" >
|
||||
<Grid Margin="8,2" >
|
||||
<Rectangle
|
||||
Fill="{DynamicResource ToolTipBackgroundBrushKey}"
|
||||
RadiusX="4"
|
||||
RadiusY="4"
|
||||
Stroke="{DynamicResource ToolTipBorderBrushKey}"
|
||||
StrokeThickness="1"/>
|
||||
<ContentPresenter
|
||||
Margin="4"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top" />
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
</ResourceDictionary>
|
||||
</UserControl.Resources>
|
||||
|
||||
@ -235,16 +204,15 @@
|
||||
</Grid.RowDefinitions>
|
||||
<Grid.ToolTip>
|
||||
<ToolTip Visibility="{Binding Result.ToolTipVisibility}">
|
||||
<StackPanel Margin="8,6">
|
||||
<StackPanel>
|
||||
<TextBlock
|
||||
Style="{DynamicResource CollapsableTextblock}"
|
||||
Foreground="{DynamicResource ToolTipForegroundBrushKey}" FontWeight="Bold" FontSize="12"
|
||||
FontWeight="Bold"
|
||||
Text="{Binding Result.ToolTipData.Title}"
|
||||
TextWrapping="Wrap"
|
||||
RenderOptions.ClearTypeHint="Enabled" />
|
||||
<TextBlock
|
||||
Style="{DynamicResource CollapsableTextblock}"
|
||||
Foreground="{DynamicResource ToolTipForegroundBrushKey}" FontSize="12"
|
||||
Text="{Binding Result.ToolTipData.Text}"
|
||||
TextWrapping="Wrap"
|
||||
RenderOptions.ClearTypeHint="Enabled" />
|
||||
@ -317,9 +285,6 @@
|
||||
<TextBlock
|
||||
AutomationProperties.Name="{x:Static p:Resources.ContextMenuItemAdditionalInformation}"
|
||||
Text="{Binding Title}"
|
||||
Foreground="{DynamicResource ToolTipForegroundBrushKey}"
|
||||
Margin="8,5"
|
||||
FontSize="12"
|
||||
RenderOptions.ClearTypeHint="Enabled"/>
|
||||
</ToolTip>
|
||||
</ToolTipService.ToolTip>
|
||||
|
||||
@ -1,339 +0,0 @@
|
||||
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||
|
||||
<Style x:Key="ScrollBarLineButton"
|
||||
TargetType="{x:Type RepeatButton}">
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
||||
<Setter Property="Focusable" Value="false" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type RepeatButton}">
|
||||
<Border x:Name="Border" Background="{DynamicResource ScrollBarLineButtonBackground}" Margin="0">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup x:Name="CommonStates">
|
||||
<VisualState x:Name="Normal" />
|
||||
<VisualState x:Name="MouseOver">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarLineButtonBackgroundPointerOver}"
|
||||
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarLineButtonForegroundPointerOver}"
|
||||
Storyboard.TargetName="Arrow"
|
||||
Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Pressed">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarLineButtonBackgroundPointerPressed}"
|
||||
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarLineButtonForegroundPointerPressed}"
|
||||
Storyboard.TargetName="Arrow"
|
||||
Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Disabled"/>
|
||||
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
<TextBlock x:Name="Arrow"
|
||||
FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="8"
|
||||
Text="{Binding Content, RelativeSource={RelativeSource TemplatedParent}}"
|
||||
Foreground="{DynamicResource ScrollBarLineButtonForeground}"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Center"/>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ScrollBarPageButton"
|
||||
TargetType="{x:Type RepeatButton}">
|
||||
<Setter Property="SnapsToDevicePixels" Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle" Value="true" />
|
||||
<Setter Property="IsTabStop" Value="false" />
|
||||
<Setter Property="Focusable" Value="false" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type RepeatButton}">
|
||||
<Border Background="Transparent"/>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<Style x:Key="ScrollBarThumb" TargetType="{x:Type Thumb}">
|
||||
<Setter Property="SnapsToDevicePixels"
|
||||
Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle"
|
||||
Value="true" />
|
||||
<Setter Property="IsTabStop"
|
||||
Value="false" />
|
||||
<Setter Property="Focusable"
|
||||
Value="false" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type Thumb}">
|
||||
<Border x:Name="Border" HorizontalAlignment="Stretch" Background="{DynamicResource ScrollBarThumbBackground}"
|
||||
BorderBrush="{TemplateBinding BorderBrush}">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup x:Name="CommonStates">
|
||||
<VisualState x:Name="Normal" />
|
||||
<VisualState x:Name="MouseOver">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarThumbPointerOver}"
|
||||
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"
|
||||
/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Pressed">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarThumbPressedColor}"
|
||||
Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Disabled"/>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
</Border>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<ControlTemplate x:Key="VerticalScrollBar" TargetType="{x:Type ScrollBar}">
|
||||
<Grid Background="Transparent">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup x:Name="CommonStates">
|
||||
<VisualState x:Name="Normal" />
|
||||
<VisualState x:Name="MouseOver">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarBackgroundPointerOver}"
|
||||
Storyboard.TargetProperty="(Grid.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
<DoubleAnimation To="16"
|
||||
Storyboard.TargetName="ScrollThumb"
|
||||
Storyboard.TargetProperty="Width"
|
||||
Duration="0:0:0.15">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseOut" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
</DoubleAnimation>
|
||||
|
||||
<DoubleAnimation To="1"
|
||||
Storyboard.TargetName="UpButton"
|
||||
Storyboard.TargetProperty="Opacity"
|
||||
Duration="0:0:0.15"/>
|
||||
|
||||
<DoubleAnimation To="1"
|
||||
Storyboard.TargetName="DownButton"
|
||||
Storyboard.TargetProperty="Opacity"
|
||||
Duration="0:0:0.15"/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Pressed"/>
|
||||
<VisualState x:Name="Disabled"/>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition MaxHeight="16" />
|
||||
<RowDefinition Height="0.00001*" />
|
||||
<RowDefinition MaxHeight="16" />
|
||||
</Grid.RowDefinitions>
|
||||
<RepeatButton x:Name="UpButton" Opacity="0" Grid.Row="0"
|
||||
Style="{StaticResource ScrollBarLineButton}"
|
||||
Height="16"
|
||||
Command="ScrollBar.LineUpCommand"
|
||||
Content="" />
|
||||
<Track x:Name="PART_Track"
|
||||
Grid.Row="1"
|
||||
IsDirectionReversed="true">
|
||||
<Track.DecreaseRepeatButton>
|
||||
<RepeatButton Style="{StaticResource ScrollBarPageButton}"
|
||||
Command="ScrollBar.PageUpCommand" />
|
||||
</Track.DecreaseRepeatButton>
|
||||
<Track.Thumb>
|
||||
<Thumb x:Name="ScrollThumb" HorizontalAlignment="Right" Width="4" Style="{StaticResource ScrollBarThumb}"/>
|
||||
</Track.Thumb>
|
||||
<Track.IncreaseRepeatButton>
|
||||
<RepeatButton Style="{StaticResource ScrollBarPageButton}"
|
||||
Command="ScrollBar.PageDownCommand" />
|
||||
</Track.IncreaseRepeatButton>
|
||||
</Track>
|
||||
<RepeatButton x:Name="DownButton" Opacity="0" Grid.Row="2"
|
||||
Style="{StaticResource ScrollBarLineButton}"
|
||||
Height="16"
|
||||
Command="ScrollBar.LineDownCommand"
|
||||
Content="" />
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
|
||||
<ControlTemplate x:Key="HorizontalScrollBar" TargetType="{x:Type ScrollBar}">
|
||||
<Grid Background="Transparent">
|
||||
<VisualStateManager.VisualStateGroups>
|
||||
<VisualStateGroup x:Name="CommonStates">
|
||||
<VisualState x:Name="Normal" />
|
||||
<VisualState x:Name="MouseOver">
|
||||
<Storyboard>
|
||||
<ColorAnimation To="{DynamicResource ScrollBarBackgroundPointerOver}"
|
||||
Storyboard.TargetProperty="(Grid.Background).(SolidColorBrush.Color)"
|
||||
Duration="0"/>
|
||||
<DoubleAnimation To="16"
|
||||
Storyboard.TargetName="ScrollThumb"
|
||||
Storyboard.TargetProperty="Height"
|
||||
Duration="0:0:0.15">
|
||||
<DoubleAnimation.EasingFunction>
|
||||
<CubicEase EasingMode="EaseOut" />
|
||||
</DoubleAnimation.EasingFunction>
|
||||
</DoubleAnimation>
|
||||
|
||||
<DoubleAnimation To="1"
|
||||
Storyboard.TargetName="LeftButton"
|
||||
Storyboard.TargetProperty="Opacity"
|
||||
Duration="0:0:0.15"/>
|
||||
|
||||
<DoubleAnimation To="1"
|
||||
Storyboard.TargetName="RightButton"
|
||||
Storyboard.TargetProperty="Opacity"
|
||||
Duration="0:0:0.15"/>
|
||||
</Storyboard>
|
||||
</VisualState>
|
||||
<VisualState x:Name="Pressed"/>
|
||||
<VisualState x:Name="Disabled"/>
|
||||
</VisualStateGroup>
|
||||
</VisualStateManager.VisualStateGroups>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition MaxWidth="16" />
|
||||
<ColumnDefinition Width="0.00001*" />
|
||||
<ColumnDefinition MaxWidth="16" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<RepeatButton x:Name="LeftButton" Grid.Column="0" Opacity="0"
|
||||
Style="{StaticResource ScrollBarLineButton}"
|
||||
Width="16"
|
||||
Command="ScrollBar.LineLeftCommand"
|
||||
Content="" />
|
||||
<Track x:Name="PART_Track"
|
||||
Grid.Column="1"
|
||||
IsDirectionReversed="False">
|
||||
<Track.DecreaseRepeatButton>
|
||||
<RepeatButton Style="{StaticResource ScrollBarPageButton}"
|
||||
Command="ScrollBar.PageLeftCommand" />
|
||||
</Track.DecreaseRepeatButton>
|
||||
<Track.Thumb>
|
||||
<Thumb x:Name="ScrollThumb" VerticalAlignment="Bottom" Height="4" Style="{StaticResource ScrollBarThumb}"/>
|
||||
</Track.Thumb>
|
||||
<Track.IncreaseRepeatButton>
|
||||
<RepeatButton Style="{StaticResource ScrollBarPageButton}"
|
||||
Command="ScrollBar.PageRightCommand" />
|
||||
</Track.IncreaseRepeatButton>
|
||||
</Track>
|
||||
<RepeatButton x:Name="RightButton" Opacity="0" Grid.Column="2"
|
||||
Style="{StaticResource ScrollBarLineButton}"
|
||||
Width="16"
|
||||
Command="ScrollBar.LineRightCommand"
|
||||
Content="" />
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
|
||||
<Style x:Key="{x:Type ScrollBar}"
|
||||
TargetType="{x:Type ScrollBar}">
|
||||
<Setter Property="SnapsToDevicePixels"
|
||||
Value="True" />
|
||||
<Setter Property="OverridesDefaultStyle"
|
||||
Value="true" />
|
||||
<Style.Triggers>
|
||||
<Trigger Property="Orientation"
|
||||
Value="Horizontal">
|
||||
<Setter Property="Width"
|
||||
Value="Auto" />
|
||||
<Setter Property="Height"
|
||||
Value="16" />
|
||||
<Setter Property="Template"
|
||||
Value="{StaticResource HorizontalScrollBar}" />
|
||||
</Trigger>
|
||||
<Trigger Property="Orientation"
|
||||
Value="Vertical">
|
||||
<Setter Property="Width"
|
||||
Value="16" />
|
||||
<Setter Property="Height"
|
||||
Value="Auto" />
|
||||
<Setter Property="Template"
|
||||
Value="{StaticResource VerticalScrollBar}" />
|
||||
</Trigger>
|
||||
</Style.Triggers>
|
||||
</Style>
|
||||
|
||||
<Style TargetType="{x:Type ScrollViewer}">
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*"/>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto" />
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollContentPresenter CanContentScroll="{TemplateBinding CanContentScroll}" CanHorizontallyScroll="False" CanVerticallyScroll="False" HorizontalAlignment="Stretch" Grid.ColumnSpan="2" Grid.RowSpan="2" Cursor="{TemplateBinding Cursor}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
|
||||
<ScrollBar Grid.Column="1" x:Name="PART_VerticalScrollBar"
|
||||
Value="{TemplateBinding VerticalOffset}" Maximum="{
|
||||
TemplateBinding ScrollableHeight}" ViewportSize="{
|
||||
TemplateBinding ViewportHeight}" Background="Transparent" />
|
||||
<ScrollBar Grid.Row="1" x:Name="PART_HorizontalScrollBar"
|
||||
Orientation="Horizontal" Value="{TemplateBinding
|
||||
HorizontalOffset}" Maximum="{TemplateBinding ScrollableWidth}"
|
||||
ViewportSize="{TemplateBinding ViewportWidth}"
|
||||
Background="Transparent" />
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>
|
||||
|
||||
<!--<Style x:Key="{x:Type ScrollViewer}" TargetType="{x:Type ScrollViewer}">
|
||||
<Setter Property="OverridesDefaultStyle" Value="True" />
|
||||
<Setter Property="Template">
|
||||
<Setter.Value>
|
||||
<ControlTemplate TargetType="{x:Type ScrollViewer}">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="*"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<ScrollContentPresenter Grid.ColumnSpan="2" Grid.RowSpan="2"/>
|
||||
<ScrollBar
|
||||
|
||||
Name="PART_VerticalScrollBar"
|
||||
Grid.Column="1"
|
||||
Value="{TemplateBinding VerticalOffset}"
|
||||
Maximum="{TemplateBinding ScrollableHeight}"
|
||||
ViewportSize="{TemplateBinding ViewportHeight}"
|
||||
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" />
|
||||
<ScrollBar
|
||||
|
||||
Name="PART_HorizontalScrollBar"
|
||||
Orientation="Horizontal"
|
||||
Grid.Row="1"
|
||||
Value="{TemplateBinding HorizontalOffset}"
|
||||
Maximum="{TemplateBinding ScrollableWidth}"
|
||||
ViewportSize="{TemplateBinding ViewportWidth}"
|
||||
Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" />
|
||||
</Grid>
|
||||
</ControlTemplate>
|
||||
</Setter.Value>
|
||||
</Setter>
|
||||
</Style>-->
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FFa1a1a1" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="White" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="#FF373737" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="#FF7a7a7a" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FF767676</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FFa4a4a4</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FF1b1b1b</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FFcdcdcd" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FFcdcdcd</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FF171717</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Transparent"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF313131</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FFa4a4a4</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FF008000" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="#FF373737" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="White" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FF008000</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FF008000</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FFFFFFFF" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FFFFFFFF</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FFFFFFFF</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Black"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FFc0c0c0" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="White" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="White" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FF0000ff</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FF0000ff</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FFFFFFFF" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FFFFFFFF</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FFFFFFFF</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Transparent"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FF3ff23f" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="White" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="White" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="White" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FF0ca7b6</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FF0ca7b6</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FFFFFFFF" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FFFFFFFF</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FFFFFFFF</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Transparent"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#5B000000" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FFFFFFFF" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FF2B2B2B" />
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FF600000" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="Black" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="Black" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="Black" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FF9a59db</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FF9a59db</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FFf0f0f0</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FF000000" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FF000000</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Transparent"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FF000000</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF000000</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFD0D0D0" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FF000000" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFFBFBFB" />
|
||||
</ResourceDictionary>
|
||||
@ -29,22 +29,4 @@
|
||||
<SolidColorBrush x:Key="SecondaryTextForeground" Color="#FF434343" />
|
||||
<SolidColorBrush x:Key="InactiveSelectionHighlightBrushKey" Color="Black" />
|
||||
<SolidColorBrush x:Key="DialogBorderBrush" Color="#FFf7f7f7" />
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarThumbBackground" Color="#FF7a7a7a" />
|
||||
<Color x:Key="ScrollBarThumbPointerOver">#FFa0a0a0</Color>
|
||||
<Color x:Key="ScrollBarThumbPointerPressed">#FF747474</Color>
|
||||
|
||||
<Color x:Key="ScrollBarBackgroundPointerOver">#FFf0f0f0</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonForeground" Color="#FF1d1d1d" />
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerOver">#FF1d1d1d</Color>
|
||||
<Color x:Key="ScrollBarLineButtonForegroundPointerPressed">#FFf3f3f3</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ScrollBarLineButtonBackground" Color="Transparent"/>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerOver">#FFd2d2d2</Color>
|
||||
<Color x:Key="ScrollBarLineButtonBackgroundPointerPressed">#FF5d5d5d</Color>
|
||||
|
||||
<SolidColorBrush x:Key="ToolTipBorderBrushKey" Color="#FFD0D0D0" />
|
||||
<SolidColorBrush x:Key="ToolTipForegroundBrushKey" Color="#FF000000" />
|
||||
<SolidColorBrush x:Key="ToolTipBackgroundBrushKey" Color="#FFFBFBFB" />
|
||||
</ResourceDictionary>
|
||||
Loading…
Reference in New Issue
Block a user