Skip to content

Commit a294fcd

Browse files
author
Pavel Kovalenko
committed
Use IntegerSlider in ColorPicker.
1 parent 4dc8290 commit a294fcd

File tree

3 files changed

+97
-218
lines changed

3 files changed

+97
-218
lines changed

src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.Designer.cs

Lines changed: 87 additions & 164 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/editors/xrSdkControls/Controls/ColorPicker/ColorPicker.cs

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -43,46 +43,26 @@ public bool Hexademical
4343
return;
4444
hexademical = value;
4545
chkHexademical.Checked = value;
46-
numRed.Hexadecimal = value;
47-
numGreen.Hexadecimal = value;
48-
numBlue.Hexadecimal = value;
49-
numAlpha.Hexadecimal = value;
46+
islRed.Hexademical = value;
47+
islGreen.Hexademical = value;
48+
islBlue.Hexademical = value;
49+
islAlpha.Hexademical = value;
5050
}
5151
}
5252

5353
private void ColorPicker_Load(object sender, EventArgs e)
5454
{
55-
numRed.ValueChanged += (obj, args) => SyncValues(tbrRed, numRed);
56-
numGreen.ValueChanged += (obj, args) => SyncValues(tbrGreen, numGreen);
57-
numBlue.ValueChanged += (obj, args) => SyncValues(tbrBlue, numBlue);
58-
numAlpha.ValueChanged += (obj, args) => SyncValues(tbrAlpha, numAlpha);
59-
tbrRed.ValueChanged += (obj, args) => SyncValues(numRed, tbrRed);
60-
tbrGreen.ValueChanged += (obj, args) => SyncValues(numGreen, tbrGreen);
61-
tbrBlue.ValueChanged += (obj, args) => SyncValues(numBlue, tbrBlue);
62-
tbrAlpha.ValueChanged += (obj, args) => SyncValues(numAlpha, tbrAlpha);
55+
islRed.ValueChanged += (obj, args) => UpdateColor();
56+
islGreen.ValueChanged += (obj, args) => UpdateColor();
57+
islBlue.ValueChanged += (obj, args) => UpdateColor();
58+
islAlpha.ValueChanged += (obj, args) => UpdateColor();
6359
chkHexademical.CheckedChanged += (obj, args) => Hexademical = chkHexademical.Checked;
6460
UpdateColor();
6561
}
66-
67-
private void SyncValues(TrackBar tbr, IntegerUpDown num)
68-
{
69-
if (tbr.Value == num.Value)
70-
return;
71-
tbr.Value = num.Value;
72-
UpdateColor();
73-
}
74-
75-
private void SyncValues(IntegerUpDown num, TrackBar tbr)
76-
{
77-
if (num.Value == tbr.Value)
78-
return;
79-
num.Value = tbr.Value;
80-
UpdateColor();
81-
}
82-
62+
8363
private void UpdateColor()
8464
{
85-
var newColor = Color.FromArgb(tbrAlpha.Value, tbrRed.Value, tbrGreen.Value, tbrBlue.Value);
65+
var newColor = Color.FromArgb(islAlpha.Value, islRed.Value, islGreen.Value, islBlue.Value);
8666
if (pbColor.ColorSample == newColor)
8767
return;
8868
pbColor.ColorSample = newColor;

0 commit comments

Comments
 (0)