Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Color picker wpf #37149

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
+392 −143
Open

Color picker wpf #37149

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
fcef988
Initial implementation
mantaionut Jan 27, 2025
7afe2f6
fix style
mantaionut Jan 27, 2025
32bf575
Added border to popup
mantaionut Jan 29, 2025
66324e8
More changes
mantaionut Jan 29, 2025
97617d0
Now use accent color for select button
mantaionut Jan 29, 2025
8fd15d3
Addressed feedback
mantaionut Feb 4, 2025
56c0a19
fix formatting
mantaionut Feb 4, 2025
44691d3
Fix pressing the select in HC mode hiding its text
mantaionut Feb 6, 2025
4182ea3
Fix W10 hc1 and hc2 hover select button text invisible
mantaionut Feb 7, 2025
7d914cb
Update src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerCont…
mantaionut Feb 12, 2025
793f81d
Addresed feedback regarding FontFamily
mantaionut Feb 19, 2025
5aeba14
Merge branch 'main' into pr37149
jaimecbernardo Feb 25, 2025
525739b
Made the titlebar part of the body
mantaionut Feb 27, 2025
75506f7
fix wrong variable
mantaionut Feb 27, 2025
d891dfe
Added system menu option on right click on toolbar.
mantaionut Mar 3, 2025
cfcdd41
Fix spell-check
mantaionut Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Initial implementation
  • Loading branch information
@mantaionut
mantaionut committed Jan 27, 2025
commit fcef988aab5c6a28962a96348853001ad4a821c1
3 changes: 1 addition & 2 deletions src/modules/colorPicker/ColorPickerUI/App.xaml
View file
Original file line number Diff line number Diff line change
@@ -3,12 +3,11 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
ThemeMode="System"
StartupUri="MainWindow.xaml">
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ui:ThemesDictionary Theme="Dark" />
<ui:ControlsDictionary />
<ResourceDictionary Source="Resources/Styles.xaml" />
<ResourceDictionary Source="Resources/ViewModelViewMappings.xaml" />
</ResourceDictionary.MergedDictionaries>
21 changes: 3 additions & 18 deletions src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ui:FluentWindow
<Window
x:Class="ColorPicker.ColorEditorWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -10,13 +10,10 @@
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Width="440"
Height="380"
ui:Design.Background="{DynamicResource ApplicationBackgroundBrush}"
ui:Design.Foreground="{DynamicResource TextFillColorPrimaryBrush}"

AutomationProperties.Name="{x:Static p:Resources.cp_editor}"
ExtendsContentIntoTitleBar="True"
ResizeMode="NoResize"
Topmost="True"
WindowCornerPreference="Default"
WindowStartupLocation="CenterScreen"
mc:Ignorable="d">
<e:Interaction.Behaviors>
@@ -27,21 +24,9 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<ui:TitleBar
x:Name="TitleBar"
Title="{x:Static p:Resources.CP_Title}"
Grid.Row="0"
Height="32"
Padding="16,0,16,0"
ShowMaximize="False"
ShowMinimize="False">
<ui:TitleBar.Icon>
<ui:ImageIcon Source="pack://application:,,,/Assets/ColorPicker/icon.ico" />
</ui:TitleBar.Icon>
</ui:TitleBar>
<ContentPresenter
x:Name="contentPresenter"
Grid.Row="1"
Content="{Binding Content}" />
</Grid>
</ui:FluentWindow>
</Window>
7 changes: 2 additions & 5 deletions src/modules/colorPicker/ColorPickerUI/ColorEditorWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -3,25 +3,22 @@
// See the LICENSE file in the project root for more information.

using System;

using System.Windows;
using ColorPicker.Helpers;
using ManagedCommon;
using Wpf.Ui.Controls;

namespace ColorPicker
{
/// <summary>
/// Interaction logic for ColorEditorWindow.xaml
/// </summary>
public partial class ColorEditorWindow : FluentWindow
public partial class ColorEditorWindow : Window
{
private readonly AppStateHandler _appStateHandler;

public ColorEditorWindow(AppStateHandler appStateHandler)
{
InitializeComponent();
Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this);
WindowBackdropType = OSVersionHelper.IsWindows11() ? WindowBackdropType.Mica : WindowBackdropType = WindowBackdropType.None;

_appStateHandler = appStateHandler;
Closing += ColorEditorWindow_Closing;
1 change: 0 additions & 1 deletion src/modules/colorPicker/ColorPickerUI/ColorPickerUI.csproj
View file
Original file line number Diff line number Diff line change
@@ -38,7 +38,6 @@
<PackageReference Include="System.IO.Abstractions" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
<PackageReference Include="System.Drawing.Common" />
<PackageReference Include="WPF-UI" />
</ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
11 changes: 5 additions & 6 deletions src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
View file
Original file line number Diff line number Diff line change
@@ -66,7 +66,6 @@
HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}"
IsTabStop="{TemplateBinding ScrollViewer.IsTabStop}"
Style="{StaticResource DefaultTextBoxScrollViewerStyle}"
TextElement.Foreground="{TemplateBinding Foreground}"
VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" />
</Grid>
@@ -129,10 +128,7 @@
Height="48"
Margin="0,0,0,8"
HorizontalAlignment="Stretch"
Background="{DynamicResource CardBackgroundFillColorDefaultBrush}"
BorderBrush="{DynamicResource CardStrokeColorDefaultBrush}"
BorderThickness="1"
CornerRadius="{DynamicResource ControlCornerRadius}">
BorderThickness="1">
<Grid Margin="12,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="48" />
@@ -173,7 +169,10 @@
Style="{StaticResource SubtleButtonStyle}"
ToolTipService.ToolTip="{x:Static p:Resources.Copy_to_clipboard}">
<Button.Content>
<ui:SymbolIcon FontSize="20" Symbol="Copy20" />
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontSize="20"
Text="&#xE8C8;" />
</Button.Content>
</Button>
</Grid>
77 changes: 39 additions & 38 deletions src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml
View file
Original file line number Diff line number Diff line change
@@ -213,13 +213,23 @@
Style="{DynamicResource ColorShadeButtonStyle}"
ToolTipService.ToolTip="{x:Static p:Resources.Selected_color_tooltip}">

<ui:Flyout
<Popup
x:Name="DetailsFlyout"
Margin="24,0,0,0"
Closed="DetailsFlyout_Closed"
Opened="DetailsFlyout_Opened"
StaysOpen="False"
Placement="Top">
<Grid x:Name="detailsGrid" KeyboardNavigation.TabNavigation="Contained">
<Border
CornerRadius="10"
Padding="15">
<Border.Background>
<SolidColorBrush Color="{StaticResource ApplicationBackgroundColor}" />
</Border.Background>
<Grid x:Name="detailsGrid" KeyboardNavigation.TabNavigation="Contained">
<Grid.Background>
<SolidColorBrush Color="{StaticResource ApplicationBackgroundColor}" />
</Grid.Background>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="44" />
<ColumnDefinition Width="86" />
@@ -317,38 +327,27 @@
Text="RGB"
TextAlignment="Center" />

<ui:NumberBox
x:Name="RNumberBox"
Grid.Row="6"
Grid.Column="1"
AutomationProperties.Name="{x:Static p:Resources.Red_value}"
Maximum="255"
Minimum="0"
SpinButtonPlacementMode="Compact"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />

<ui:NumberBox
x:Name="GNumberBox"
Grid.Row="6"
Grid.Column="2"
Margin="4,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Green_value}"
Maximum="255"
Minimum="0"
SpinButtonPlacementMode="Compact"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />

<ui:NumberBox
x:Name="BNumberBox"
Grid.Row="6"
Grid.Column="3"
Margin="4,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Blue_value}"
Maximum="255"
Minimum="0"
SpinButtonPlacementMode="Compact"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />

<TextBox
x:Name="RNumberBox"
Grid.Row="6"
Grid.Column="1"
AutomationProperties.Name="{x:Static p:Resources.Red_value}"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
<TextBox
x:Name="GNumberBox"
Grid.Row="6"
Grid.Column="2"
Margin="4,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Green_value}"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />
<TextBox
x:Name="BNumberBox"
Grid.Row="6"
Grid.Column="3"
Margin="4,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Blue_value}"
TextBoxBase.TextChanged="RGBNumberBox_TextChanged" />

<TextBlock
Grid.Row="8"
Width="38"
@@ -370,18 +369,20 @@
TextChanged="HexCode_TextChanged"
TextWrapping="Wrap" />

<ui:Button
<Button
x:Name="OKButton"
Grid.Row="9"
Grid.ColumnSpan="4"
Margin="0,32,0,0"
HorizontalAlignment="Stretch"
Appearance="Primary"
Background="{DynamicResource {x:Static SystemColors.AccentColorBrushKey}}"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it possible to use {StaticResource} with a value from WinUI Gallery?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't use WinUI but .net WPF.

AutomationProperties.Name="{x:Static p:Resources.Select}"
Click="OKButton_Click"
Content="{x:Static p:Resources.Select}" />
</Grid>
</ui:Flyout>

</Grid>
</Border>
</Popup>
</Button>


32 changes: 16 additions & 16 deletions src/modules/colorPicker/ColorPickerUI/Controls/ColorPickerControl.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@

using ColorPicker.Helpers;
using ManagedCommon;
using Wpf.Ui.Controls;

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.Value = newColor.R;
control.GNumberBox.Value = newColor.G;
control.BNumberBox.Value = newColor.B;
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.Value = currentColor.R;
GNumberBox.Value = currentColor.G;
BNumberBox.Value = currentColor.B;
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.Hide();
DetailsFlyout.IsOpen = false;
}

private void DetailsFlyout_Closed(object sender, object e)
@@ -361,11 +360,10 @@ private void RGBNumberBox_TextChanged(object sender, TextChangedEventArgs e)
{
if (!_ignoreRGBChanges)
{
var numberBox = sender as NumberBox;

byte r = numberBox.Name == "RNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)RNumberBox.Value;
byte g = numberBox.Name == "GNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)GNumberBox.Value;
byte b = numberBox.Name == "BNumberBox" ? GetValueFromNumberBox(numberBox) : (byte)BNumberBox.Value;
var numberBox = sender as TextBox;
byte r = GetValueFromNumberBox(RNumberBox);
byte g = GetValueFromNumberBox(GNumberBox);
byte b = GetValueFromNumberBox(BNumberBox);

_ignoreRGBChanges = true;
SetColorFromTextBoxes(System.Drawing.Color.FromArgb(r, g, b));
@@ -379,22 +377,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(NumberBox numberBox)
private static byte GetValueFromNumberBox(TextBox numberBox)
{
int minimum = 0;
int maximum = 255;
double? parsedValue = ParseDouble(numberBox.Text);

if (parsedValue != null)
{
var parsedValueByte = (byte)parsedValue;

if (parsedValueByte >= numberBox.Minimum && parsedValueByte <= numberBox.Maximum)
if (parsedValueByte >= minimum && parsedValueByte <= maximum)
{
return parsedValueByte;
}
}

// not valid input, return previous value
return (byte)numberBox.Value;
return 0;
}

public static double? ParseDouble(string text)
8 changes: 0 additions & 8 deletions src/modules/colorPicker/ColorPickerUI/Helpers/AppStateHandler.cs
View file
Original file line number Diff line number Diff line change
@@ -138,14 +138,6 @@ private void ShowColorPicker()
Application.Current.MainWindow.Opacity = 0;
Application.Current.MainWindow.Visibility = Visibility.Visible;
_colorPickerShown = true;

// HACK: WPF UI theme watcher removes the composition target background color, among other weird stuff.
// https://github.com/lepoco/wpfui/blob/303f0aefcd59a142bc681415dc4360a34a15f33d/src/Wpf.Ui/Controls/Window/WindowBackdrop.cs#L280
// So we set it back with https://github.com/lepoco/wpfui/blob/303f0aefcd59a142bc681415dc4360a34a15f33d/src/Wpf.Ui/Controls/Window/WindowBackdrop.cs#L191
// And also reapply the intended backdrop.
// This hack fixes: https://github.com/microsoft/PowerToys/issues/31725
Wpf.Ui.Controls.WindowBackdrop.RemoveBackground(Application.Current.MainWindow);
Wpf.Ui.Controls.WindowBackdrop.ApplyBackdrop(Application.Current.MainWindow, Wpf.Ui.Controls.WindowBackdropType.None);
}
}

2 changes: 0 additions & 2 deletions src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,6 @@
using System.Windows.Interop;

using ColorPicker.ViewModelContracts;
using Wpf.Ui.Controls;

namespace ColorPicker
{
@@ -20,7 +19,6 @@ public MainWindow()
{
Closing += MainWindow_Closing;
Bootstrapper.InitializeContainer(this);
Wpf.Ui.Appearance.SystemThemeWatcher.Watch(this, WindowBackdropType.None);
InitializeComponent();
DataContext = this;
Show(); // Call show just to make sure source is initialized at startup.
Loading
Oops, something went wrong.