Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Color Picker] Increase width of editor window (#13420)

Browse Source
This commit is contained in:
Jaime Bernardo
2021-09-24 16:54:58 +01:00
committed by GitHub
parent 3358fd9b02
commit 6212c1bb80
4 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
View File

@@ -17,7 +17,7 @@
BorderThickness="1" BorderThickness="1"
Title="Color Picker" Title="Color Picker"
Height="380" Height="380"
Width="400" Width="440"
ResizeMode="NoResize" ResizeMode="NoResize"
Topmost="True" Topmost="True"
WindowStartupLocation="CenterScreen"> WindowStartupLocation="CenterScreen">

2
src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
View File

@@ -8,7 +8,7 @@
<Border x:Name="MainBorder" <Border x:Name="MainBorder"
Margin="12,16,12,0" Margin="12,16,12,0"
Width="308" Width="348"
Height="36" Height="36"
CornerRadius="2" CornerRadius="2"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"

10
src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
View File

@@ -239,11 +239,11 @@
ShadowDepth="2" /> ShadowDepth="2" />
</Grid.Effect> </Grid.Effect>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="36" /> <ColumnDefinition Width="46" />
<ColumnDefinition Width="36" /> <ColumnDefinition Width="46" />
<ColumnDefinition Width="165" /> <ColumnDefinition Width="165" />
<ColumnDefinition Width="36" /> <ColumnDefinition Width="46" />
<ColumnDefinition Width="36" /> <ColumnDefinition Width="46" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Button x:Name="colorVariation1Button" <Button x:Name="colorVariation1Button"
@@ -288,7 +288,7 @@
Background="Red" Background="Red"
Width="165" Width="165"
Height="48" Height="48"
Margin="72,0,0,0" Margin="92,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Selected_color}" AutomationProperties.Name="{x:Static p:Resources.Selected_color}"
AutomationProperties.HelpText="{x:Static p:Resources.Selected_color_helptext}" AutomationProperties.HelpText="{x:Static p:Resources.Selected_color_helptext}"
ToolTipService.ToolTip="{x:Static p:Resources.Selected_color_tooltip}" ToolTipService.ToolTip="{x:Static p:Resources.Selected_color_tooltip}"

16
src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
View File

@@ -191,13 +191,7 @@ namespace ColorPicker.Controls
{ {
_isCollapsed = false; _isCollapsed = false;
var opacityAppear = new DoubleAnimation(1.0, new Duration(TimeSpan.FromMilliseconds(300))); var resizeColor = new DoubleAnimation(349, new Duration(TimeSpan.FromMilliseconds(250)));
opacityAppear.EasingFunction = new QuadraticEase() { EasingMode = EasingMode.EaseInOut };
var resize = new DoubleAnimation(400, new Duration(TimeSpan.FromMilliseconds(300)));
resize.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut };
var resizeColor = new DoubleAnimation(309, new Duration(TimeSpan.FromMilliseconds(250)));
resizeColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut }; resizeColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut };
var moveColor = new ThicknessAnimation(new Thickness(0), new Duration(TimeSpan.FromMilliseconds(250))); var moveColor = new ThicknessAnimation(new Thickness(0), new Duration(TimeSpan.FromMilliseconds(250)));
@@ -217,16 +211,10 @@ namespace ColorPicker.Controls
{ {
_isCollapsed = true; _isCollapsed = true;
var opacityAppear = new DoubleAnimation(0, new Duration(TimeSpan.FromMilliseconds(150)));
opacityAppear.EasingFunction = new QuadraticEase() { EasingMode = EasingMode.EaseInOut };
var resize = new DoubleAnimation(0, new Duration(TimeSpan.FromMilliseconds(150)));
resize.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut };
var resizeColor = new DoubleAnimation(165, new Duration(TimeSpan.FromMilliseconds(150))); var resizeColor = new DoubleAnimation(165, new Duration(TimeSpan.FromMilliseconds(150)));
resizeColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut }; resizeColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut };
var moveColor = new ThicknessAnimation(new Thickness(72, 0, 0, 0), new Duration(TimeSpan.FromMilliseconds(150))); var moveColor = new ThicknessAnimation(new Thickness(92, 0, 0, 0), new Duration(TimeSpan.FromMilliseconds(150)));
moveColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut }; moveColor.EasingFunction = new ExponentialEase() { EasingMode = EasingMode.EaseInOut };
ControlHelper.SetCornerRadius(CurrentColorButton, new CornerRadius(0)); ControlHelper.SetCornerRadius(CurrentColorButton, new CornerRadius(0));