Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-04 18:26:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FZ Editor] Updated (preview) zone colors (#9799)

Browse Source 
* Updated colors

* Updated border colors

* Updated borderbrush

* Updated background colors

* Added DropShadow
This commit is contained in:
Niels Laute
2021-02-22 10:50:33 +01:00
committed by GitHub
parent 072638ab73
commit ed25ae64e5
10 changed files with 70 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/modules/fancyzones/editor/FancyZonesEditor/CanvasZone.xaml
View File

@@ -12,7 +12,7 @@
<UserControl.Resources>
<Style x:Key="CanvasZoneThumbStyle" TargetType="{x:Type Thumb}">
<Setter Property="Stylus.IsPressAndHoldEnabled" Value="false"/>
<Setter Property="Background" Value="Transparent"/>
<Setter Property="Background" Value="Transparent" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Thumb}">
@@ -79,9 +79,10 @@
</Style>
</UserControl.Resources>
<Border BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
<Border BorderBrush="{DynamicResource LayoutPreviewZoneBorderBrush}"
Background="{DynamicResource CanvasZoneBackgroundBrush}"
CornerRadius="4"
Effect="{StaticResource ZoneDropShadow}"
BorderThickness="1">
<Grid x:Name="Frame">
<Grid.RowDefinitions>
@@ -126,7 +127,7 @@
</TextBlock>
</DockPanel>
<Thumb x:Name="Caption" Cursor="SizeAll" Background="Transparent" BorderThickness="3" Padding="4" Grid.Column="0" Grid.ColumnSpan="5" Grid.Row="0" Grid.RowSpan="5" DragDelta="UniversalDragDelta" DragStarted="Caption_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
<Thumb x:Name="Caption" Cursor="SizeAll" Background="Transparent" BorderThickness="3" Padding="4" Grid.Column="0" Grid.ColumnSpan="5" Margin="-1" Grid.Row="0" Grid.RowSpan="5" DragDelta="UniversalDragDelta" DragStarted="Caption_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
<Thumb x:Name="NResize" Cursor="SizeNS" BorderThickness="0,3,0,0" Grid.ColumnSpan="5" DragDelta="UniversalDragDelta" DragStarted="NResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>
<Thumb x:Name="SResize" Cursor="SizeNS" BorderThickness="0,0,0,3" Grid.Row="4" Grid.ColumnSpan="5" DragDelta="UniversalDragDelta" DragStarted="SResize_DragStarted" Style="{DynamicResource CanvasZoneThumbStyle}"/>

6
src/modules/fancyzones/editor/FancyZonesEditor/GridZone.xaml
View File

@@ -6,13 +6,17 @@
xmlns:local="clr-namespace:FancyZonesEditor"
xmlns:props="clr-namespace:FancyZonesEditor.Properties"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
d:DesignHeight="450"
d:DesignWidth="800"
Background="{DynamicResource GridZoneBackgroundBrush}"
BorderBrush="{DynamicResource SystemControlBackgroundAccentBrush}"
BorderBrush="{DynamicResource LayoutPreviewZoneBorderBrush}"
BorderThickness="1"
Opacity="1"
ui:ControlHelper.CornerRadius="4"
Effect="{StaticResource ZoneDropShadow}"
mc:Ignorable="d">
<Grid x:Name="Frame">
<Canvas x:Name="Body" />
<DockPanel HorizontalAlignment="Center"

8
src/modules/fancyzones/editor/FancyZonesEditor/LayoutPreview.xaml.cs
View File

@@ -189,7 +189,7 @@ namespace FancyZonesEditor
rect.Width = Math.Max(0, colInfo[maxCol].End - left);
rect.Height = Math.Max(0, rowInfo[maxRow].End - top);
rect.Style = (Style)FindResource("GridLayoutPreviewActualSizeStyle");
rect.Style = (Style)FindResource("GridLayoutActualScalePreviewStyle");
frame.Children.Add(rect);
_zones.Add(new Int32Rect(
(int)left, (int)top, (int)rect.Width, (int)rect.Height));
@@ -261,7 +261,7 @@ namespace FancyZonesEditor
Grid.SetColumnSpan(rect, span);
rect.Margin = margin;
rect.Style = (Style)FindResource("GridLayoutPreviewStyle");
rect.Style = (Style)FindResource("GridLayoutSmallScalePreviewStyle");
Body.Children.Add(rect);
}
}
@@ -310,11 +310,11 @@ namespace FancyZonesEditor
if (IsActualSize)
{
rect.Style = (Style)FindResource("CanvasLayoutPreviewActualSizeStyle");
rect.Style = (Style)FindResource("CanvasLayoutActualScalePreviewStyle");
}
else
{
rect.Style = (Style)FindResource("CanvasLayoutPreviewStyle");
rect.Style = (Style)FindResource("CanvasLayoutSmallScalePreviewStyle");
}
frame.Children.Add(rect);

36
src/modules/fancyzones/editor/FancyZonesEditor/Styles/LayoutPreviewStyles.xaml
View File

@@ -3,39 +3,35 @@
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:local="clr-namespace:FancyZonesEditor.Styles">
<Style x:Key="GridLayoutPreviewStyle" TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewZoneBackgroundBrush}" />
<DropShadowEffect x:Key="ZoneDropShadow" BlurRadius="16" Opacity="0.28" ShadowDepth="1" />
<Style x:Key="GridLayoutSmallScalePreviewStyle" TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewSmallScaleZoneBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource LayoutItemBackgroundBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius" Value="4" />
</Style>
<Style x:Key="GridLayoutPreviewActualSizeStyle"
TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewZoneBackgroundBrush}" />
<Style x:Key="GridLayoutActualScalePreviewStyle" TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewActualScaleZoneBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource LayoutPreviewZoneBorderBrush}" />
<Setter Property="BorderThickness" Value="1" />
<Setter Property="CornerRadius"
Value="4" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Effect" Value="{StaticResource ZoneDropShadow}" />
</Style>
<Style x:Key="CanvasLayoutPreviewStyle"
TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewZoneBackgroundBrush}" />
<Style x:Key="CanvasLayoutSmallScalePreviewStyle" TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewSmallScaleZoneBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource LayoutItemBackgroundBrush}" />
<Setter Property="BorderThickness" Value="10" />
<Setter Property="CornerRadius" Value="4" />
</Style>
<Style x:Key="CanvasLayoutPreviewActualSizeStyle"
TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewZoneBackgroundBrush}" />
<Style x:Key="CanvasLayoutActualScalePreviewStyle" TargetType="Border">
<Setter Property="Background" Value="{DynamicResource LayoutPreviewActualScaleZoneBackgroundBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource LayoutPreviewZoneBorderBrush}" />
<Setter Property="BorderThickness"
Value="1" />
<Setter Property="CornerRadius"
Value="4" />
<Setter Property="BorderThickness" Value="2" />
<Setter Property="CornerRadius" Value="4" />
<Setter Property="Effect" Value="{StaticResource ZoneDropShadow}" />
</Style>
</ResourceDictionary>

12
src/modules/fancyzones/editor/FancyZonesEditor/Themes/Dark.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF9a9a9a" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88000000" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E55B5B5B" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FF3A3A3A" />
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FF333333" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#331B1B1B" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF5a5a5a" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BF1b1b1b"/>
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E51b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF555454" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5202020" />
</ResourceDictionary>

12
src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast1.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88000000" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E55B5B5B" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FF2b2b2b" />
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FF333333" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#331B1B1B" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF1b1b1b" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E51b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF555454" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5202020" />
</ResourceDictionary>

12
src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrast2.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88000000" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E55B5B5B" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FF2b2b2b" />
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FF333333" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#331B1B1B" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF1b1b1b" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E51b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF555454" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5202020" />
</ResourceDictionary>

12
src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastBlack.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88000000" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E55B5B5B" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF9a9a9a" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FF3A3A3A" />
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FF333333" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#331B1B1B" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF5a5a5a" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BF1b1b1b" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E51b1b1b" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FF555454" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FF202020" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5202020" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5202020" />
</ResourceDictionary>

10
src/modules/fancyzones/editor/FancyZonesEditor/Themes/HighContrastWhite.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FFF3F3F3" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF37006e" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88FFFFFF" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E5949494" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF949494" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FFffffff" />
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FFf2f2f2" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#88cccccc" />
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#19949494" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#9c9c9c" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BFffffff" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5ffffff" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#EFF3F3F3" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FFDCDCDC" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5F3F3F3" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5F3F3F3" />
</ResourceDictionary>

12
src/modules/fancyzones/editor/FancyZonesEditor/Themes/Light.xaml
View File

@@ -15,13 +15,15 @@
<SolidColorBrush x:Key="TertiaryBackgroundBrush" Color="#FFF3F3F3" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF949494" />
<SolidColorBrush x:Key="BackdropBrush" Color="#88FFFFFF" />
<SolidColorBrush x:Key="BackdropBrush" Color="#E5949494" />
<SolidColorBrush x:Key="TitleBarSecondaryForegroundBrush" Color="#FF949494" />
<SolidColorBrush x:Key="LayoutItemBackgroundBrush" Color="#FFffffff"/>
<SolidColorBrush x:Key="LayoutItemBackgroundPointerOverBrush" Color="#FFf2f2f2" />
<SolidColorBrush x:Key="LayoutPreviewZoneBackgroundBrush" Color="#88cccccc"/>
<SolidColorBrush x:Key="LayoutPreviewBackgroundBrush" Color="#19949494" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#9c9c9c" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#BFffffff"/>
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5ffffff" />
<SolidColorBrush x:Key="LayoutPreviewZoneBorderBrush" Color="#FFC3BEBE" />
<SolidColorBrush x:Key="LayoutPreviewActualScaleZoneBackgroundBrush" Color="#E5F3F3F3" />
<SolidColorBrush x:Key="LayoutPreviewSmallScaleZoneBackgroundBrush" Color="#FFDCDCDC" />
<SolidColorBrush x:Key="CanvasZoneBackgroundBrush" Color="#E5F3F3F3" />
<SolidColorBrush x:Key="GridZoneBackgroundBrush" Color="#E5F3F3F3" />
</ResourceDictionary>