Color picker wpf #37149
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -14,7 +14,6 @@ | |||||
|
|
||||||
| using ColorPicker.Helpers; | ||||||
| using ManagedCommon; | ||||||
|
|
||||||
| using static System.Net.Mime.MediaTypeNames; | ||||||
|
|
||||||
|
|
@@ -76,9 +75,9 @@ private static void SelectedColorPropertyChanged(DependencyObject d, DependencyP | |||||
| control._ignoreRGBChanges = true; | ||||||
|
|
||||||
| control.HexCode.Text = ColorToHex(newColor); | ||||||
| control.RNumberBox.Text = newColor.R.ToString(CultureInfo.InvariantCulture); | ||||||
| control.GNumberBox.Text = newColor.G.ToString(CultureInfo.InvariantCulture); | ||||||
| control.BNumberBox.Text = newColor.B.ToString(CultureInfo.InvariantCulture); | ||||||
| control.SetColorFromTextBoxes(System.Drawing.Color.FromArgb(newColor.R, newColor.G, newColor.B)); | ||||||
|
|
||||||
| control._ignoreRGBChanges = false; | ||||||
|
|
@@ -175,9 +174,9 @@ private void UpdateTextBoxesAndCurrentColor(Color currentColor) | |||||
|
|
||||||
| if (!_ignoreRGBChanges) | ||||||
| { | ||||||
| RNumberBox.Text = currentColor.R.ToString(CultureInfo.InvariantCulture); | ||||||
| GNumberBox.Text = currentColor.G.ToString(CultureInfo.InvariantCulture); | ||||||
| BNumberBox.Text = currentColor.B.ToString(CultureInfo.InvariantCulture); | ||||||
| } | ||||||
|
|
||||||
| _currentColor = currentColor; | ||||||
|
|
@@ -231,7 +230,7 @@ private void OKButton_Click(object sender, RoutedEventArgs e) | |||||
| { | ||||||
| SelectedColorChangedCommand.Execute(_currentColor); | ||||||
| SessionEventHelper.Event.EditorColorAdjusted = true; | ||||||
| DetailsFlyout.IsOpen = false; | ||||||
| } | ||||||
|
|
||||||
| private void DetailsFlyout_Closed(object sender, object e) | ||||||
|
|
@@ -357,15 +356,19 @@ private void HexCode_GotKeyboardFocus(object sender, KeyboardFocusChangedEventAr | |||||
| (sender as System.Windows.Controls.TextBox).SelectAll(); | ||||||
| } | ||||||
|
|
||||||
| private void TextBox_PreviewTextInput(object sender, TextCompositionEventArgs e) | ||||||
| { | ||||||
| e.Handled = !System.Text.RegularExpressions.Regex.IsMatch(e.Text, "^[0-9]+$"); | ||||||
|
There was a problem hiding this comment. The regex should allow hexadecimal characters (0-9, a-f, A-F) for color codes. Update the regex to: "^[0-9a-fA-F]+$".
Suggested change
Copilot uses AI. Check for mistakes. |
||||||
| } | ||||||
|
|
||||||
| private void RGBNumberBox_TextChanged(object sender, TextChangedEventArgs e) | ||||||
| { | ||||||
| if (!_ignoreRGBChanges) | ||||||
| { | ||||||
| var numberBox = sender as TextBox; | ||||||
| byte r = numberBox.Name == "RNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.R) : _currentColor.R; | ||||||
| byte g = numberBox.Name == "GNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.G) : _currentColor.G; | ||||||
| byte b = numberBox.Name == "BNumberBox" ? GetValueFromNumberBox(numberBox, _currentColor.B) : _currentColor.B; | ||||||
|
|
||||||
| _ignoreRGBChanges = true; | ||||||
| SetColorFromTextBoxes(System.Drawing.Color.FromArgb(r, g, b)); | ||||||
|
|
@@ -379,22 +382,24 @@ private void RGBNumberBox_TextChanged(object sender, TextChangedEventArgs e) | |||||
| /// </summary> | ||||||
| /// <param name="numberBox">numberBox control which value we want to get</param> | ||||||
| /// <returns>Validated value as per numberbox conditions, if content is invalid it returns previous value</returns> | ||||||
| private static byte GetValueFromNumberBox(TextBox numberBox, byte previousValue) | ||||||
| { | ||||||
| int minimum = 0; | ||||||
| int maximum = 255; | ||||||
| double? parsedValue = ParseDouble(numberBox.Text); | ||||||
|
|
||||||
| if (parsedValue != null) | ||||||
| { | ||||||
| var parsedValueByte = (byte)parsedValue; | ||||||
|
|
||||||
| if (parsedValueByte >= minimum && parsedValueByte <= maximum) | ||||||
| { | ||||||
| return parsedValueByte; | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| // not valid input, return previous value | ||||||
| return previousValue; | ||||||
| } | ||||||
|
|
||||||
| public static double? ParseDouble(string text) | ||||||
|
|
||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.