DarthAffe/RGBSyncPlus
1
0
Fork 0
mirror of https://github.com/DarthAffe/RGBSyncPlus synced 2025-12-12 17:08:31 +00:00
Code Issues Releases Wiki Activity

Updated RGB.NET

Browse Source
This commit is contained in:
Darth Affe 2019-05-26 12:30:20 +02:00
parent 5ffcaab409
commit b783572a73
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
RGBSync+/Controls/ColorSelector.cs
View File

@ -320,7 +320,7 @@ namespace RGBSyncPlus.Controls
private void HSVChanged() private void HSVChanged()
{ {
Color color = Color.FromHSV(_a, _hue, _saturation, _value); Color color = HSVColor.Create(_a, _hue, _saturation, _value);
UpdateSelectedColor(color); UpdateSelectedColor(color);
SetRGB(color); SetRGB(color);
UpdateUIColors(); UpdateUIColors();
@ -331,7 +331,7 @@ namespace RGBSyncPlus.Controls
{ {
_ignorePropertyChanged = true; _ignorePropertyChanged = true;
_a = color.A; _a = color.GetA();
if (_sliderAlpha != null) if (_sliderAlpha != null)
_sliderAlpha.Value = _a; _sliderAlpha.Value = _a;
@ -342,15 +342,15 @@ namespace RGBSyncPlus.Controls
{ {
_ignorePropertyChanged = true; _ignorePropertyChanged = true;
_r = color.R; _r = color.GetR();
if (_sliderRed != null) if (_sliderRed != null)
_sliderRed.Value = _r; _sliderRed.Value = _r;
_g = color.G; _g = color.GetG();
if (_sliderGreen != null) if (_sliderGreen != null)
_sliderGreen.Value = _g; _sliderGreen.Value = _g;
_b = color.B; _b = color.GetB();
if (_sliderBlue != null) if (_sliderBlue != null)
_sliderBlue.Value = _b; _sliderBlue.Value = _b;
@ -361,15 +361,14 @@ namespace RGBSyncPlus.Controls
{ {
_ignorePropertyChanged = true; _ignorePropertyChanged = true;
_hue = color.Hue; (_hue, _saturation, _value) = color.GetHSV();
if (_sliderHue != null) if (_sliderHue != null)
_sliderHue.Value = _hue; _sliderHue.Value = _hue;
_saturation = color.Saturation;
if (_sliderSaturation != null) if (_sliderSaturation != null)
_sliderSaturation.Value = _saturation; _sliderSaturation.Value = _saturation;
_value = color.Value;
if (_sliderValue != null) if (_sliderValue != null)
_sliderValue.Value = _value; _sliderValue.Value = _value;
@ -411,13 +410,13 @@ namespace RGBSyncPlus.Controls
private void UpdateUIColors() private void UpdateUIColors()
{ {
Color hueColor = Color.FromHSV(_hue, 1, 1); Color hueColor = HSVColor.Create(_hue, 1, 1);
if (_previewBrush != null) if (_previewBrush != null)
_previewBrush.Color = WpfColor.FromArgb(_a, _r, _g, _b); _previewBrush.Color = WpfColor.FromArgb(_a, _r, _g, _b);
if (_selectorBrush != null) if (_selectorBrush != null)
_selectorBrush.Color = WpfColor.FromRgb(hueColor.R, hueColor.G, hueColor.B); _selectorBrush.Color = WpfColor.FromRgb(hueColor.GetR(), hueColor.GetG(), hueColor.GetB());
if (_alphaBrush != null) if (_alphaBrush != null)
{ {
@ -445,36 +444,36 @@ namespace RGBSyncPlus.Controls
if (_hueBrush != null) if (_hueBrush != null)
{ {
Color referenceColor1 = Color.FromHSV(0, _saturation, _value); Color referenceColor1 = HSVColor.Create(0, _saturation, _value);
Color referenceColor2 = Color.FromHSV(60, _saturation, _value); Color referenceColor2 = HSVColor.Create(60, _saturation, _value);
Color referenceColor3 = Color.FromHSV(120, _saturation, _value); Color referenceColor3 = HSVColor.Create(120, _saturation, _value);
Color referenceColor4 = Color.FromHSV(180, _saturation, _value); Color referenceColor4 = HSVColor.Create(180, _saturation, _value);
Color referenceColor5 = Color.FromHSV(240, _saturation, _value); Color referenceColor5 = HSVColor.Create(240, _saturation, _value);
Color referenceColor6 = Color.FromHSV(300, _saturation, _value); Color referenceColor6 = HSVColor.Create(300, _saturation, _value);
_hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B); _hueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
_hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.R, referenceColor2.G, referenceColor2.B); _hueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor2.GetR(), referenceColor2.GetG(), referenceColor2.GetB());
_hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.R, referenceColor3.G, referenceColor3.B); _hueBrush.GradientStops[2].Color = WpfColor.FromArgb(_a, referenceColor3.GetR(), referenceColor3.GetG(), referenceColor3.GetB());
_hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.R, referenceColor4.G, referenceColor4.B); _hueBrush.GradientStops[3].Color = WpfColor.FromArgb(_a, referenceColor4.GetR(), referenceColor4.GetG(), referenceColor4.GetB());
_hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.R, referenceColor5.G, referenceColor5.B); _hueBrush.GradientStops[4].Color = WpfColor.FromArgb(_a, referenceColor5.GetR(), referenceColor5.GetG(), referenceColor5.GetB());
_hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.R, referenceColor6.G, referenceColor6.B); _hueBrush.GradientStops[5].Color = WpfColor.FromArgb(_a, referenceColor6.GetR(), referenceColor6.GetG(), referenceColor6.GetB());
_hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.R, referenceColor1.G, referenceColor1.B); _hueBrush.GradientStops[6].Color = WpfColor.FromArgb(_a, referenceColor1.GetR(), referenceColor1.GetG(), referenceColor1.GetB());
} }
if (_saturationBrush != null) if (_saturationBrush != null)
{ {
Color referenceColor = Color.FromHSV(_hue, 1, _value); Color referenceColor = HSVColor.Create(_hue, 1, _value);
_saturationBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 255, 255, 255); _saturationBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 255, 255, 255);
_saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B); _saturationBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
} }
if (_valueBrush != null) if (_valueBrush != null)
{ {
Color referenceColor = Color.FromHSV(_hue, _saturation, 1); Color referenceColor = HSVColor.Create(_hue, _saturation, 1);
_valueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 0, 0, 0); _valueBrush.GradientStops[0].Color = WpfColor.FromArgb(_a, 0, 0, 0);
_valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.R, referenceColor.G, referenceColor.B); _valueBrush.GradientStops[1].Color = WpfColor.FromArgb(_a, referenceColor.GetR(), referenceColor.GetG(), referenceColor.GetB());
} }
} }

6
RGBSync+/Controls/GradientEditor.cs
View File

@ -167,8 +167,8 @@ namespace RGBSyncPlus.Controls
private void UpdatePreviewRectangle(Rectangle rect, double referenceWidth, double referenceHeight, double from, double to, private void UpdatePreviewRectangle(Rectangle rect, double referenceWidth, double referenceHeight, double from, double to,
RGB.NET.Core.Color startColor, RGB.NET.Core.Color endColor) RGB.NET.Core.Color startColor, RGB.NET.Core.Color endColor)
{ {
rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.A, startColor.R, startColor.G, startColor.B), rect.Fill = new LinearGradientBrush(Color.FromArgb(startColor.GetA(), startColor.GetR(), startColor.GetG(), startColor.GetB()),
Color.FromArgb(endColor.A, endColor.R, endColor.G, endColor.B), Color.FromArgb(endColor.GetA(), endColor.GetR(), endColor.GetG(), endColor.GetB()),
new Point(0, 0.5), new Point(1, 0.5)); new Point(0, 0.5), new Point(1, 0.5));
//DarthAffe 09.02.2018: Forced rounding to prevent render issues on resize //DarthAffe 09.02.2018: Forced rounding to prevent render issues on resize
@ -212,7 +212,7 @@ namespace RGBSyncPlus.Controls
private void UpdateGradientStop(ContentControl control, double referenceWidth, double referenceHeight, GradientStop stop) private void UpdateGradientStop(ContentControl control, double referenceWidth, double referenceHeight, GradientStop stop)
{ {
control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.A, stop.Color.R, stop.Color.G, stop.Color.B)); control.Background = new SolidColorBrush(Color.FromArgb(stop.Color.GetA(), stop.Color.GetR(), stop.Color.GetG(), stop.Color.GetB()));
Canvas.SetLeft(control, (referenceWidth * stop.Offset.Clamp(0, 1)) - (control.Width / 2.0)); Canvas.SetLeft(control, (referenceWidth * stop.Offset.Clamp(0, 1)) - (control.Width / 2.0));

8
RGBSync+/RGBSync+.csproj
View File

@ -202,16 +202,16 @@
<Version>12.0.1</Version> <Version>12.0.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="RGB.NET.Brushes"> <PackageReference Include="RGB.NET.Brushes">
<Version>0.1.15</Version> <Version>0.1.23</Version>
</PackageReference> </PackageReference>
<PackageReference Include="RGB.NET.Core"> <PackageReference Include="RGB.NET.Core">
<Version>0.1.15</Version> <Version>0.1.23</Version>
</PackageReference> </PackageReference>
<PackageReference Include="RGB.NET.Decorators"> <PackageReference Include="RGB.NET.Decorators">
<Version>0.1.15</Version> <Version>0.1.23</Version>
</PackageReference> </PackageReference>
<PackageReference Include="RGB.NET.Groups"> <PackageReference Include="RGB.NET.Groups">
<Version>0.1.15</Version> <Version>0.1.23</Version>
</PackageReference> </PackageReference>
<PackageReference Include="System.ValueTuple"> <PackageReference Include="System.ValueTuple">
<Version>4.5.0</Version> <Version>4.5.0</Version>