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
Prev Previous commit
Next Next commit
Addresed feedback regarding FontFamily
  • Loading branch information
@mantaionut
mantaionut committed Feb 19, 2025
commit 793f81d83e138849587c7afc16dde7b4fd05be1d
2 changes: 1 addition & 1 deletion src/modules/colorPicker/ColorPickerUI/Controls/ColorFormatControl.xaml
View file
Original file line number Diff line number Diff line change
@@ -172,7 +172,7 @@
ToolTipService.ToolTip="{x:Static p:Resources.Copy_to_clipboard}">
<Button.Content>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xE8C8;" />
</Button.Content>
</Button>
2 changes: 2 additions & 0 deletions src/modules/colorPicker/ColorPickerUI/Resources/Styles.xaml
View file
Original file line number Diff line number Diff line change
@@ -3,6 +3,8 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converters="clr-namespace:ColorPicker.Converters"
xmlns:helpers="clr-namespace:ColorPicker.Helpers">

<FontFamily x:Key="IconFontFamily">Segoe Fluent Icons, Segoe MDL2 Assets</FontFamily>
<!-- CONVERTERS -->
<BooleanToVisibilityConverter x:Key="bool2VisibilityConverter" />
<converters:BoolToInvertedVisibilityConverter x:Key="bool2InvertedVisibilityConverter" />
16 changes: 8 additions & 8 deletions src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
View file
Original file line number Diff line number Diff line change
@@ -31,7 +31,7 @@
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,4,0,0"
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xef3c;"/>

<!-- The label text -->
@@ -71,14 +71,14 @@
Header="{x:Static p:Resources.Remove}">
<MenuItem.Icon>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xE74D;"/>
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="{x:Static p:Resources.Export_by}">
<MenuItem.Icon>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xEDE1;" />
</MenuItem.Icon>
<MenuItem
@@ -87,7 +87,7 @@
Header="{x:Static p:Resources.Export_by_color}">
<MenuItem.Icon>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xE790;" />
</MenuItem.Icon>
</MenuItem>
@@ -97,7 +97,7 @@
Header="{x:Static p:Resources.Export_by_format}">
<MenuItem.Icon>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Text="&#xE943;" />
</MenuItem.Icon>
</MenuItem>
@@ -207,7 +207,7 @@
ToolTipService.ToolTip="{x:Static p:Resources.Open_settings}">
<Button.Content>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
FontSize="18"
Text="&#xE713;" />
</Button.Content>
@@ -278,7 +278,7 @@
Orientation="Vertical"
Visibility="{Binding ColorsHistory.Count, Converter={StaticResource numberToInvertedVisibilityConverter}}">
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
HorizontalAlignment="Center"
FontSize="36"
Text="&#xEF3C;" />
@@ -310,7 +310,7 @@
AutomationProperties.Name="{x:Static p:Resources.Copied_to_clipboard}"
Orientation="Horizontal">
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontFamily="{StaticResource IconFontFamily}"
Margin="0,0,8,0"
FontSize="20"
Foreground="{DynamicResource TextOnAccentFillColorPrimaryBrush}"