mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-24 20:57:19 -08:00
refactor: use custom color picker instead of Avalonia.Controls.ColorPicker
This commit is contained in:
leo
parent
bede3663ec
commit
69117e8ee9
6 changed files with 257 additions and 9 deletions
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
<Application.Styles>
|
||||
<FluentTheme />
|
||||
<StyleInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Fluent/Fluent.xaml" />
|
||||
<StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
|
||||
<StyleInclude Source="/Resources/Styles.axaml"/>
|
||||
</Application.Styles>
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ using System.Globalization;
|
|||
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Data;
|
||||
using Avalonia.Data.Converters;
|
||||
using Avalonia.Media;
|
||||
|
||||
|
|
@ -43,19 +44,27 @@ namespace SourceGit.Converters
|
|||
return Models.Bookmarks.Brushes[bookmark];
|
||||
});
|
||||
|
||||
public class ToColorConverter : IValueConverter
|
||||
public class ToColorHexStringConverter : IValueConverter
|
||||
{
|
||||
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
return Color.FromUInt32((uint)value);
|
||||
return Color.FromUInt32((uint)value).ToString();
|
||||
}
|
||||
|
||||
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
|
||||
{
|
||||
return ((Color)value).ToUInt32();
|
||||
try
|
||||
{
|
||||
var color = Color.Parse(value as string);
|
||||
return color.ToUInt32();
|
||||
}
|
||||
catch
|
||||
{
|
||||
return BindingOperations.DoNothing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static readonly ToColorConverter ToColor = new ToColorConverter();
|
||||
public static readonly ToColorHexStringConverter ToColorHexString = new ToColorHexStringConverter();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,7 +39,6 @@
|
|||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Avalonia" Version="11.1.3" />
|
||||
<PackageReference Include="Avalonia.Controls.ColorPicker" Version="11.1.3" />
|
||||
<PackageReference Include="Avalonia.Desktop" Version="11.1.3" />
|
||||
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.1.3" />
|
||||
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.3" />
|
||||
|
|
|
|||
|
|
@ -431,6 +431,9 @@ namespace SourceGit.ViewModels
|
|||
|
||||
public void Save()
|
||||
{
|
||||
if (!Native.OS.DataDir.Contains("AppData"))
|
||||
throw new Exception("xxx");
|
||||
|
||||
var file = Path.Combine(Native.OS.DataDir, "preference.json");
|
||||
var data = JsonSerializer.Serialize(this, JsonCodeGen.Default.Preference);
|
||||
File.WriteAllText(file, data);
|
||||
|
|
|
|||
238
src/Views/ColorPicker.cs
Normal file
238
src/Views/ColorPicker.cs
Normal file
|
|
@ -0,0 +1,238 @@
|
|||
using System;
|
||||
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Media;
|
||||
|
||||
namespace SourceGit.Views
|
||||
{
|
||||
public class ColorPicker : Control
|
||||
{
|
||||
public static readonly StyledProperty<uint> ValueProperty =
|
||||
AvaloniaProperty.Register<ColorPicker, uint>(nameof(Value), 0);
|
||||
|
||||
public uint Value
|
||||
{
|
||||
get => GetValue(ValueProperty);
|
||||
set => SetValue(ValueProperty, value);
|
||||
}
|
||||
|
||||
private static readonly Color[,] COLOR_TABLE = new Color[,]
|
||||
{
|
||||
{
|
||||
// Ordering reversed for this section only
|
||||
Color.FromArgb(255, 255, 67, 67), /* #FF4343 */
|
||||
Color.FromArgb(255, 209, 52, 56), /* #D13438 */
|
||||
Color.FromArgb(255, 239, 105, 80), /* #EF6950 */
|
||||
Color.FromArgb(255, 218, 59, 1), /* #DA3B01 */
|
||||
Color.FromArgb(255, 202, 80, 16), /* #CA5010 */
|
||||
Color.FromArgb(255, 247, 99, 12), /* #F7630C */
|
||||
Color.FromArgb(255, 255, 140, 0), /* #FF8C00 */
|
||||
Color.FromArgb(255, 255, 185, 0), /* #FFB900 */
|
||||
},
|
||||
{
|
||||
Color.FromArgb(255, 231, 72, 86), /* #E74856 */
|
||||
Color.FromArgb(255, 232, 17, 35), /* #E81123 */
|
||||
Color.FromArgb(255, 234, 0, 94), /* #EA005E */
|
||||
Color.FromArgb(255, 195, 0, 82), /* #C30052 */
|
||||
Color.FromArgb(255, 227, 0, 140), /* #E3008C */
|
||||
Color.FromArgb(255, 191, 0, 119), /* #BF0077 */
|
||||
Color.FromArgb(255, 194, 57, 179), /* #C239B3 */
|
||||
Color.FromArgb(255, 154, 0, 137), /* #9A0089 */
|
||||
},
|
||||
{
|
||||
Color.FromArgb(255, 0, 120, 215), /* #0078D7 */
|
||||
Color.FromArgb(255, 0, 99, 177), /* #0063B1 */
|
||||
Color.FromArgb(255, 142, 140, 216), /* #8E8CD8 */
|
||||
Color.FromArgb(255, 107, 105, 214), /* #6B69D6 */
|
||||
Color.FromArgb(255, 135, 100, 184), /* #8764B8 */
|
||||
Color.FromArgb(255, 116, 77, 169), /* #744DA9 */
|
||||
Color.FromArgb(255, 177, 70, 194), /* #B146C2 */
|
||||
Color.FromArgb(255, 136, 23, 152), /* #881798 */
|
||||
},
|
||||
{
|
||||
Color.FromArgb(255, 0, 153, 188), /* #0099BC */
|
||||
Color.FromArgb(255, 45, 125, 154), /* #2D7D9A */
|
||||
Color.FromArgb(255, 0, 183, 195), /* #00B7C3 */
|
||||
Color.FromArgb(255, 3, 131, 135), /* #038387 */
|
||||
Color.FromArgb(255, 0, 178, 148), /* #00B294 */
|
||||
Color.FromArgb(255, 1, 133, 116), /* #018574 */
|
||||
Color.FromArgb(255, 0, 204, 106), /* #00CC6A */
|
||||
Color.FromArgb(255, 16, 137, 62), /* #10893E */
|
||||
},
|
||||
{
|
||||
Color.FromArgb(255, 122, 117, 116), /* #7A7574 */
|
||||
Color.FromArgb(255, 93, 90, 80), /* #5D5A58 */
|
||||
Color.FromArgb(255, 104, 118, 138), /* #68768A */
|
||||
Color.FromArgb(255, 81, 92, 107), /* #515C6B */
|
||||
Color.FromArgb(255, 86, 124, 115), /* #567C73 */
|
||||
Color.FromArgb(255, 72, 104, 96), /* #486860 */
|
||||
Color.FromArgb(255, 73, 130, 5), /* #498205 */
|
||||
Color.FromArgb(255, 16, 124, 16), /* #107C10 */
|
||||
},
|
||||
{
|
||||
Color.FromArgb(255, 118, 118, 118), /* #767676 */
|
||||
Color.FromArgb(255, 76, 74, 72), /* #4C4A48 */
|
||||
Color.FromArgb(255, 105, 121, 126), /* #69797E */
|
||||
Color.FromArgb(255, 74, 84, 89), /* #4A5459 */
|
||||
Color.FromArgb(255, 100, 124, 100), /* #647C64 */
|
||||
Color.FromArgb(255, 82, 94, 84), /* #525E54 */
|
||||
Color.FromArgb(255, 132, 117, 69), /* #847545 */
|
||||
Color.FromArgb(255, 126, 115, 95), /* #7E735F */
|
||||
}
|
||||
};
|
||||
|
||||
static ColorPicker()
|
||||
{
|
||||
ValueProperty.Changed.AddClassHandler<ColorPicker>((c, _) => c.UpdateColors());
|
||||
}
|
||||
|
||||
public override void Render(DrawingContext context)
|
||||
{
|
||||
base.Render(context);
|
||||
|
||||
// Color table.
|
||||
var border = this.FindResource("Brush.Border0") as IBrush;
|
||||
var pen = new Pen(border, 0.2);
|
||||
{
|
||||
for (int i = 0; i < 6; i++)
|
||||
{
|
||||
for (int j = 0; j < 8; j++)
|
||||
{
|
||||
var idx = i * 8 + j;
|
||||
var x = j * 32.0;
|
||||
var y = i * 32.0;
|
||||
context.DrawRectangle(new SolidColorBrush(COLOR_TABLE[i, j]), pen, new Rect(x, y, 32, 32));
|
||||
if (idx == _hightlightedTableElement)
|
||||
context.DrawRectangle(new Pen(Brushes.White, 2), new Rect(x + 2, y + 2, 28, 28));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Palette picker
|
||||
{
|
||||
var y = 6 * 32 + 8;
|
||||
var x = 0;
|
||||
|
||||
context.FillRectangle(new SolidColorBrush(_darkestColor), new Rect(x, y, 32, 32)); x += 32;
|
||||
context.FillRectangle(new SolidColorBrush(_darkerColor), new Rect(x, y, 32, 32)); x += 32;
|
||||
context.FillRectangle(new SolidColorBrush(_darkColor), new Rect(x, y, 32, 32)); x += 32;
|
||||
context.FillRectangle(new SolidColorBrush(_color), new Rect(x, y - 4, 64, 40), 4); x += 64;
|
||||
context.FillRectangle(new SolidColorBrush(_lightColor), new Rect(x, y, 32, 32)); x += 32;
|
||||
context.FillRectangle(new SolidColorBrush(_lighterColor), new Rect(x, y, 32, 32)); x += 32;
|
||||
context.FillRectangle(new SolidColorBrush(_lightestColor), new Rect(x, y, 32, 32));
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnPropertyChanged(AvaloniaPropertyChangedEventArgs change)
|
||||
{
|
||||
base.OnPropertyChanged(change);
|
||||
|
||||
if (change.Property == ValueProperty)
|
||||
{
|
||||
UpdateColors();
|
||||
InvalidateVisual();
|
||||
}
|
||||
}
|
||||
|
||||
protected override Size MeasureOverride(Size availableSize)
|
||||
{
|
||||
var w = 32 * 8;
|
||||
var h = 32 * 6 + 16 + 36;
|
||||
return new Size(w, h);
|
||||
}
|
||||
|
||||
protected override void OnPointerPressed(PointerPressedEventArgs e)
|
||||
{
|
||||
base.OnPointerPressed(e);
|
||||
|
||||
var p = e.GetPosition(this);
|
||||
if (_colorTableRect.Contains(p))
|
||||
{
|
||||
int col = (int)Math.Floor(p.X / 32.0);
|
||||
int row = (int)Math.Floor(p.Y / 32.0);
|
||||
int idx = row * 8 + col;
|
||||
if (_hightlightedTableElement != idx)
|
||||
{
|
||||
_hightlightedTableElement = idx;
|
||||
SetCurrentValue(ValueProperty, COLOR_TABLE[row, col].ToUInt32());
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
if (_darkestRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _darkestColor.ToUInt32());
|
||||
}
|
||||
else if (_darkerRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _darkerColor.ToUInt32());
|
||||
}
|
||||
else if (_darkRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _darkColor.ToUInt32());
|
||||
}
|
||||
else if (_lightRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _lightColor.ToUInt32());
|
||||
}
|
||||
else if (_lighterRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _lighterColor.ToUInt32());
|
||||
}
|
||||
else if (_lightestRect.Contains(p))
|
||||
{
|
||||
_hightlightedTableElement = -1;
|
||||
SetCurrentValue(ValueProperty, _lightestColor.ToUInt32());
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateColors()
|
||||
{
|
||||
_color = Color.FromUInt32(Value);
|
||||
|
||||
var hsvColor = _color.ToHsv();
|
||||
_darkestColor = GetNextColor(hsvColor, -0.3);
|
||||
_darkerColor = GetNextColor(hsvColor, -0.2);
|
||||
_darkColor = GetNextColor(hsvColor, -0.1);
|
||||
_lightColor = GetNextColor(hsvColor, 0.1);
|
||||
_lighterColor = GetNextColor(hsvColor, 0.2);
|
||||
_lightestColor = GetNextColor(hsvColor, 0.3);
|
||||
}
|
||||
|
||||
private Color GetNextColor(HsvColor c, double step)
|
||||
{
|
||||
var v = c.V;
|
||||
v += step;
|
||||
v = Math.Round(v, 2);
|
||||
|
||||
var newColor = new HsvColor(c.A, c.H, c.S, v);
|
||||
return newColor.ToRgb();
|
||||
}
|
||||
|
||||
private Rect _colorTableRect = new Rect(0, 0, 32 * 8, 32 * 6);
|
||||
private Rect _darkestRect = new Rect(0, 200, 32, 32);
|
||||
private Rect _darkerRect = new Rect(32, 200, 32, 32);
|
||||
private Rect _darkRect = new Rect(64, 200, 32, 32);
|
||||
private Rect _lightRect = new Rect(160, 200, 32, 32);
|
||||
private Rect _lighterRect = new Rect(192, 200, 32, 32);
|
||||
private Rect _lightestRect = new Rect(224, 200, 32, 32);
|
||||
|
||||
private int _hightlightedTableElement = -1;
|
||||
|
||||
private Color _darkestColor;
|
||||
private Color _darkerColor;
|
||||
private Color _darkColor;
|
||||
private Color _color;
|
||||
private Color _lightColor;
|
||||
private Color _lighterColor;
|
||||
private Color _lightestColor;
|
||||
}
|
||||
}
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
</Grid>
|
||||
|
||||
<!-- BODY -->
|
||||
<Grid Grid.Row="1" ColumnDefinitions="200,*" Height="250" Margin="8">
|
||||
<Grid Grid.Row="1" ColumnDefinitions="200,*" Height="320" Margin="8">
|
||||
<Border Grid.Column="0"
|
||||
BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}"
|
||||
Background="{DynamicResource Brush.Contents}">
|
||||
|
|
@ -111,8 +111,8 @@
|
|||
<TextBlock Grid.Row="0" Text="{DynamicResource Text.ConfigureWorkspace.Name}"/>
|
||||
<TextBox Grid.Row="1" Margin="0,4,0,0" CornerRadius="3" Height="28" Text="{Binding Name, Mode=TwoWay}"/>
|
||||
|
||||
<TextBlock Grid.Row="2" Margin="0,12,0,0" Text="{DynamicResource Text.ConfigureWorkspace.Color}"/>
|
||||
<ColorPicker Grid.Row="3" Margin="0,4,0,0" Width="100" HorizontalAlignment="Left" Color="{Binding Color, Converter={x:Static c:IntConverters.ToColor}, Mode=TwoWay}"/>
|
||||
<TextBlock Grid.Row="2" Margin="0,12,0,4" Text="{DynamicResource Text.ConfigureWorkspace.Color}"/>
|
||||
<v:ColorPicker Grid.Row="3" HorizontalAlignment="Left" Value="{Binding Color, Mode=TwoWay}"/>
|
||||
</Grid>
|
||||
</DataTemplate>
|
||||
</ContentControl.DataTemplates>
|
||||
|
|
|
|||
Loading…
Reference in a new issue