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

Jump to bottom

[Settings UI] [Colour schemes page] Redesign Colour Buttons #8997

Closed
wants to merge 5 commits into from
Closed

[Settings UI] [Colour schemes page] Redesign Colour Buttons #8997

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
731c75f
Redesign colour buttons
Chips1234 Feb 1, 2021
63f86a9
Add non-bright colours row
Chips1234 Feb 5, 2021
56d3f42
Split colour table into two
Chips1234 Feb 14, 2021
062b9f8
Merge branch 'main' into dev/chips1234/redesign-colour-buttons-8765
Chips1234 Feb 14, 2021
3a3477f
Fix error
Chips1234 Feb 16, 2021
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
32 changes: 16 additions & 16 deletions src/cascadia/TerminalSettingsEditor/ColorSchemes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,22 +21,22 @@ using namespace winrt::Windows::Foundation::Collections;
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
static const std::array<hstring, 16> TableColorNames = {
RS_(L"ColorScheme_Black/Header"),
RS_(L"ColorScheme_Red/Header"),
RS_(L"ColorScheme_Green/Header"),
RS_(L"ColorScheme_Yellow/Header"),
RS_(L"ColorScheme_Blue/Header"),
RS_(L"ColorScheme_Purple/Header"),
RS_(L"ColorScheme_Cyan/Header"),
RS_(L"ColorScheme_White/Header"),
RS_(L"ColorScheme_BrightBlack/Header"),
RS_(L"ColorScheme_BrightRed/Header"),
RS_(L"ColorScheme_BrightGreen/Header"),
RS_(L"ColorScheme_BrightYellow/Header"),
RS_(L"ColorScheme_BrightBlue/Header"),
RS_(L"ColorScheme_BrightPurple/Header"),
RS_(L"ColorScheme_BrightCyan/Header"),
RS_(L"ColorScheme_BrightWhite/Header")
RS_(L"ColorScheme_Black/ToolTip"),
RS_(L"ColorScheme_Red/ToolTip"),
RS_(L"ColorScheme_Green/ToolTip"),
RS_(L"ColorScheme_Yellow/ToolTip"),
RS_(L"ColorScheme_Blue/ToolTip"),
RS_(L"ColorScheme_Purple/ToolTip"),
RS_(L"ColorScheme_Cyan/ToolTip"),
RS_(L"ColorScheme_White/ToolTip"),
RS_(L"ColorScheme_BrightBlack/ToolTip"),
RS_(L"ColorScheme_BrightRed/ToolTip"),
RS_(L"ColorScheme_BrightGreen/ToolTip"),
RS_(L"ColorScheme_BrightYellow/ToolTip"),
RS_(L"ColorScheme_BrightBlue/ToolTip"),
RS_(L"ColorScheme_BrightPurple/ToolTip"),
RS_(L"ColorScheme_BrightCyan/ToolTip"),
RS_(L"ColorScheme_BrightWhite/ToolTip")
};

static const std::array<std::wstring, 9> InBoxSchemes = {
Expand Down
29 changes: 12 additions & 17 deletions src/cascadia/TerminalSettingsEditor/ColorSchemes.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ the MIT License. See LICENSE in the project root for license information. -->
<ResourceDictionary Source="CommonResources.xaml"/>
</ResourceDictionary.MergedDictionaries>

<Thickness x:Key="ColorSchemesStandardControlMargin">0,0,10,20</Thickness>
<Thickness x:Key="ColorSchemesStandardControlMargin">0,0,10,10</Thickness>

<Style x:Key="ColorStackPanelStyle" TargetType="StackPanel">
<Setter Property="Margin" Value="{StaticResource ColorSchemesStandardControlMargin}"/>
<Setter Property="Height" Value="59"/>
<Setter Property="Height" Value="30"/>
</Style>

<Style x:Key="ColorHeaderStyle" TargetType="TextBlock">
Expand Down Expand Up @@ -156,9 +156,8 @@ the MIT License. See LICENSE in the project root for license information. -->
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="local:ColorTableEntry">
<StackPanel Style="{StaticResource ColorStackPanelStyle}">
<TextBlock Text="{x:Bind Name, Mode=OneWay}"
Style="{StaticResource ColorHeaderStyle}"/>
<Button Background="{x:Bind Color, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
<Button Background="{x:Bind Color, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}"
ToolTipService.ToolTip="{x:Bind Name, Mode=OneWay}">


<Button.Resources>
Expand Down Expand Up @@ -194,9 +193,8 @@ the MIT License. See LICENSE in the project root for license information. -->
Grid.Column="1"
Style="{StaticResource ItemsControlStyle}">
<StackPanel Style="{StaticResource ColorStackPanelStyle}">
<TextBlock x:Uid="ColorScheme_Foreground"
Style="{StaticResource ColorHeaderStyle}"/>
<Button Background="{Binding Color, ElementName=ForegroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
<Button x:Uid="ColorScheme_Foreground"
Copy link
Member

Choose a reason for hiding this comment

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

@cinnamon-msft Do we want to keep the labels for Foreground, Background, Selection Color and Cursor Color?

Background="{Binding Color, ElementName=ForegroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">


<Button.Resources>
Expand All @@ -222,9 +220,8 @@ the MIT License. See LICENSE in the project root for license information. -->
</Button>
</StackPanel>
<StackPanel Style="{StaticResource ColorStackPanelStyle}">
<TextBlock x:Uid="ColorScheme_Background"
Style="{StaticResource ColorHeaderStyle}"/>
<Button Background="{Binding Color, ElementName=BackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
<Button x:Uid="ColorScheme_Background"
Background="{Binding Color, ElementName=BackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">


<Button.Resources>
Expand All @@ -251,9 +248,8 @@ the MIT License. See LICENSE in the project root for license information. -->
</Button>
</StackPanel>
<StackPanel Style="{StaticResource ColorStackPanelStyle}">
<TextBlock x:Uid="ColorScheme_CursorColor"
Style="{StaticResource ColorHeaderStyle}"/>
<Button Background="{Binding Color, ElementName=CursorColorPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
<Button x:Uid="ColorScheme_CursorColor"
Background="{Binding Color, ElementName=CursorColorPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">


<Button.Resources>
Expand All @@ -280,9 +276,8 @@ the MIT License. See LICENSE in the project root for license information. -->
</Button>
</StackPanel>
<StackPanel Style="{StaticResource ColorStackPanelStyle}">
<TextBlock x:Uid="ColorScheme_SelectionBackground"
Style="{StaticResource ColorHeaderStyle}"/>
<Button Background="{Binding Color, ElementName=SelectionBackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">
<Button x:Uid="ColorScheme_SelectionBackground"
Background="{Binding Color, ElementName=SelectionBackgroundPicker, Converter={StaticResource ColorToBrushConverter}, Mode=OneWay}">


<Button.Resources>
Expand Down
40 changes: 20 additions & 20 deletions src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,64 +117,64 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ColorScheme_Background.Text" xml:space="preserve">
<data name="ColorScheme_Background.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
Copy link
Member

Choose a reason for hiding this comment

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

why is this one (and others) [using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip while the rest are just ToolTip?

Copy link
Contributor Author

@Chips1234 Chips1234 Feb 3, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

Because that one is linked to the "Background" button (x:Uid="identifier"), while the rest are linked through a XAML binding.

<value>Background</value>
</data>
<data name="ColorScheme_Black.Header" xml:space="preserve">
<data name="ColorScheme_Black.ToolTip" xml:space="preserve">
<value>Black</value>
</data>
<data name="ColorScheme_Blue.Header" xml:space="preserve">
<data name="ColorScheme_Blue.ToolTip" xml:space="preserve">
<value>Blue</value>
</data>
<data name="ColorScheme_BrightBlack.Header" xml:space="preserve">
<data name="ColorScheme_BrightBlack.ToolTip" xml:space="preserve">
<value>Bright black</value>
</data>
<data name="ColorScheme_BrightBlue.Header" xml:space="preserve">
<data name="ColorScheme_BrightBlue.ToolTip" xml:space="preserve">
<value>Bright blue</value>
</data>
<data name="ColorScheme_BrightCyan.Header" xml:space="preserve">
<data name="ColorScheme_BrightCyan.ToolTip" xml:space="preserve">
<value>Bright cyan</value>
</data>
<data name="ColorScheme_BrightGreen.Header" xml:space="preserve">
<data name="ColorScheme_BrightGreen.ToolTip" xml:space="preserve">
<value>Bright green</value>
</data>
<data name="ColorScheme_BrightPurple.Header" xml:space="preserve">
<data name="ColorScheme_BrightPurple.ToolTip" xml:space="preserve">
<value>Bright purple</value>
</data>
<data name="ColorScheme_BrightRed.Header" xml:space="preserve">
<data name="ColorScheme_BrightRed.ToolTip" xml:space="preserve">
<value>Bright red</value>
</data>
<data name="ColorScheme_BrightWhite.Header" xml:space="preserve">
<data name="ColorScheme_BrightWhite.ToolTip" xml:space="preserve">
<value>Bright white</value>
</data>
<data name="ColorScheme_BrightYellow.Header" xml:space="preserve">
<data name="ColorScheme_BrightYellow.ToolTip" xml:space="preserve">
<value>Bright yellow</value>
</data>
<data name="ColorScheme_CursorColor.Text" xml:space="preserve">
<data name="ColorScheme_CursorColor.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Cursor color</value>
</data>
<data name="ColorScheme_Cyan.Header" xml:space="preserve">
<data name="ColorScheme_Cyan.ToolTip" xml:space="preserve">
<value>Cyan</value>
</data>
<data name="ColorScheme_Foreground.Text" xml:space="preserve">
<data name="ColorScheme_Foreground.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Foreground</value>
</data>
<data name="ColorScheme_Green.Header" xml:space="preserve">
<data name="ColorScheme_Green.ToolTip" xml:space="preserve">
<value>Green</value>
</data>
<data name="ColorScheme_Purple.Header" xml:space="preserve">
<data name="ColorScheme_Purple.ToolTip" xml:space="preserve">
<value>Purple</value>
</data>
<data name="ColorScheme_SelectionBackground.Text" xml:space="preserve">
<data name="ColorScheme_SelectionBackground.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
<value>Selection background</value>
</data>
<data name="ColorScheme_Red.Header" xml:space="preserve">
<data name="ColorScheme_Red.ToolTip" xml:space="preserve">
<value>Red</value>
</data>
<data name="ColorScheme_White.Header" xml:space="preserve">
<data name="ColorScheme_White.ToolTip" xml:space="preserve">
<value>White</value>
</data>
<data name="ColorScheme_Yellow.Header" xml:space="preserve">
<data name="ColorScheme_Yellow.ToolTip" xml:space="preserve">
<value>Yellow</value>
</data>
<data name="Globals_AlwaysShowTabs.Header" xml:space="preserve">
Expand Down