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.

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
Open
Changes from 1 commit
Commits
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
Addressed feedback
  • Loading branch information
mantaionut committed Feb 4, 2025
commit 8fd15d31745ef4cb425a29a5a1f1f812bc6750a1
Original file line number Diff line number Diff line change
@@ -173,7 +173,6 @@
<Button.Content>
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontSize="20"
Text="&#xE8C8;" />
</Button.Content>
</Button>
Original file line number Diff line number Diff line change
@@ -221,7 +221,7 @@
StaysOpen="False"
Placement="Top">
<Border
CornerRadius="10"
CornerRadius="16"
BorderBrush="{DynamicResource {x:Static SystemColors.ActiveBorderBrushKey}}"
BorderThickness="1"
Background="{DynamicResource ApplicationBackgroundBrush}"
@@ -368,14 +368,14 @@
MaxLength="7"
TextChanged="HexCode_TextChanged"
TextWrapping="Wrap" />

<Button
x:Name="OKButton"
Grid.Row="9"
Grid.ColumnSpan="4"
Margin="0,32,0,0"
HorizontalAlignment="Stretch"
Background="{DynamicResource {x:Static SystemColors.AccentColorBrushKey}}"
Style="{StaticResource AccentButtonStyle}"
AutomationProperties.Name="{x:Static p:Resources.Select}"
Click="OKButton_Click"
Content="{x:Static p:Resources.Select}" />
34 changes: 18 additions & 16 deletions src/modules/colorPicker/ColorPickerUI/Views/ColorEditorView.xaml
Original file line number Diff line number Diff line change
@@ -22,24 +22,25 @@
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<Button Height="36"
VerticalAlignment="Top"
AutomationProperties.Name="{x:Static p:Resources.Pick_color}"
Command="{Binding OpenColorPickerCommand}"
TabIndex="0"
ToolTipService.ToolTip="{x:Static p:Resources.Pick_color}">
VerticalAlignment="Top"
AutomationProperties.Name="{x:Static p:Resources.Pick_color}"
Command="{Binding OpenColorPickerCommand}"
TabIndex="0"
ToolTipService.ToolTip="{x:Static p:Resources.Pick_color}">

<StackPanel Orientation="Horizontal">
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
Text="&#xef3c;"/>

<!-- The label text -->
<TextBlock Margin="8,0,0,0"
Text="{x:Static p:Resources.New_Label}"
VerticalAlignment="Center" />
</StackPanel>
</Button>
Margin="0,4,0,0"
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
Text="&#xef3c;"/>

<!-- The label text -->
<TextBlock Margin="8,0,0,0"
Text="{x:Static p:Resources.New_Label}"
VerticalAlignment="Center" />
</StackPanel>
</Button>

<ListView
x:Name="HistoryColors"
Grid.Column="1"
@@ -278,8 +279,9 @@
Visibility="{Binding ColorsHistory.Count, Converter={StaticResource numberToInvertedVisibilityConverter}}">
<TextBlock
FontFamily="Segoe Fluent Icons, Segoe MDL2 Assets"
FontSize="40"
Text="&#xE74D;" />
HorizontalAlignment="Center"
FontSize="36"
Text="&#xEF3C;" />
<TextBlock
Margin="24,16,24,16"
HorizontalAlignment="Center"