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

Add Selection Background Color as a setting to Profiles and Col… #3471

Merged
merged 20 commits into from
Nov 13, 2019
Merged

Add Selection Background Color as a setting to Profiles and Col… #3471

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
db9c4c1
adding selectionBackground to ColorScheme and TerminalSettings
leonMSFT Oct 30, 2019
3ea3bbc
Changing PaintSelection inside the renderers to take a SelectionBackg…
leonMSFT Nov 1, 2019
1d2cd97
changes to conhost and terminal renderdata, and to terminal settings …
leonMSFT Nov 2, 2019
ea3cc5b
IT WORKS
leonMSFT Nov 5, 2019
3df73bc
modification of unit tests, json schemas, reordering of functions
leonMSFT Nov 6, 2019
04d9857
more movement
leonMSFT Nov 6, 2019
a745812
changed a couple of unit tests to add selectionBackground, added the …
leonMSFT Nov 6, 2019
4a055de
default selection background should be slightly offwhite like the def…
leonMSFT Nov 7, 2019
1f17ab1
reverting changes to .sln
leonMSFT Nov 7, 2019
23d8ebd
cleaning up
leonMSFT Nov 7, 2019
3368d09
adding comment
leonMSFT Nov 7, 2019
ce2ef34
oops
leonMSFT Nov 7, 2019
bee39c9
Merge branch 'master' into dev/lelian/selectionBackgroundColor
leonMSFT Nov 7, 2019
171d27b
added clangformat to my vs hehe
leonMSFT Nov 7, 2019
f886695
Merge branch 'dev/lelian/selectionBackgroundColor' of https://github.…
leonMSFT Nov 7, 2019
6d880b2
moving selectionBackground to IControlSettings and removing from ICor…
leonMSFT Nov 12, 2019
e05c859
trying to figure out why the WHOLE FILE LOOKS LIKE ITS CHANGED
leonMSFT Nov 12, 2019
81d5f7b
here it goes again
leonMSFT Nov 12, 2019
a9ec011
pls
leonMSFT Nov 13, 2019
39cec12
adding default foreground as the default for selection background in dx
leonMSFT Nov 13, 2019
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
2 changes: 2 additions & 0 deletions doc/cascadia/SettingsSchema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ Properties listed below are specific to each unique profile.
| `icon` | Optional | String | | Image file location of the icon used in the profile. Displays within the tab and the dropdown menu. |
| `padding` | Optional | String | `8, 8, 8, 8` | Sets the padding around the text within the window. Can have three different formats: `"#"` sets the same padding for all sides, `"#, #"` sets the same padding for left-right and top-bottom, and `"#, #, #, #"` sets the padding individually for left, top, right, and bottom. |
| `scrollbarState` | Optional | String | | Defines the visibility of the scrollbar. Possible values: `"visible"`, `"hidden"` |
| `selectionBackground` | Optional | String | Sets the selection background color of the profile. Overrides `selectionBackground` set in color scheme if `colorscheme` is set. Uses hex color format: `"#rrggbb"`. |
| `snapOnInput` | Optional | Boolean | `true` | When set to `true`, the window will scroll to the command input line when typing. When set to `false`, the window will not scroll when you start typing. |
| `source` | Optional | String | | Stores the name of the profile generator that originated this profile. _There are no discoverable values for this field._ |
| `startingDirectory` | Optional | String | `%USERPROFILE%` | The directory the shell starts in when it is loaded. |
Expand All @@ -57,6 +58,7 @@ Properties listed below are specific to each color scheme. [ColorTool](https://g
| `name` | _Required_ | String | Name of the color scheme. |
| `foreground` | _Required_ | String | Sets the foreground color of the color scheme. |
| `background` | _Required_ | String | Sets the background color of the color scheme. |
| `selectionBackground` | Optional | String | Sets the selection background color of the color scheme. |
| `black` | _Required_ | String | Sets the color used as ANSI black. |
| `blue` | _Required_ | String | Sets the color used as ANSI blue. |
| `brightBlack` | _Required_ | String | Sets the color used as ANSI bright black. |
Expand Down
8 changes: 8 additions & 0 deletions doc/cascadia/profiles.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,10 @@
],
"type": "string"
},
"selectionBackground": {
"$ref": "#/definitions/Color",
"description": "Sets the selection background color of the profile. Overrides selection background set in color scheme if colorscheme is set. Uses hex color format: \"#rrggbb\"."
},
"snapOnInput": {
"default": true,
"description": "When set to true, the window will scroll to the command input line when typing. When set to false, the window will not scroll when you start typing.",
Expand Down Expand Up @@ -490,6 +494,10 @@
"$ref": "#/definitions/Color",
"description": "Sets the color used as ANSI red."
},
"selectionBackground": {
"$ref": "#/definitions/Color",
"description": "Sets the selection background color of the color scheme."
},
"white": {
"$ref": "#/definitions/Color",
"description": "Sets the color used as ANSI white."
Expand Down
7 changes: 7 additions & 0 deletions src/cascadia/LocalTests_TerminalApp/ColorSchemeTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ namespace TerminalAppLocalTests
"name": "scheme0",
"foreground": "#000000",
"background": "#010101",
"selectionBackground": "#010100",
"red": "#010000",
"green": "#000100",
"blue": "#000001"
Expand All @@ -106,6 +107,7 @@ namespace TerminalAppLocalTests
"name": "scheme1",
"foreground": "#020202",
"background": "#030303",
"selectionBackground": "#020200",
"red": "#020000",
"blue": "#000002"
Expand All @@ -114,6 +116,7 @@ namespace TerminalAppLocalTests
"name": "scheme0",
"foreground": "#040404",
"background": "#050505",
"selectionBackground": "#030300",
"red": "#030000",
"green": "#000300"
})" };
Expand All @@ -126,6 +129,8 @@ namespace TerminalAppLocalTests
VERIFY_ARE_EQUAL(L"scheme0", scheme0._schemeName);
VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 0), scheme0._defaultForeground);
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), scheme0._defaultBackground);
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 0), scheme0._selectionBackground);
VERIFY_ARE_EQUAL(ARGB(0, 1, 0, 0), scheme0._table[XTERM_RED_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 1), scheme0._table[XTERM_BLUE_ATTR]);
Expand All @@ -136,6 +141,7 @@ namespace TerminalAppLocalTests

VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), scheme0._defaultForeground);
VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 3), scheme0._defaultBackground);
VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 0), scheme0._selectionBackground);
VERIFY_ARE_EQUAL(ARGB(0, 2, 0, 0), scheme0._table[XTERM_RED_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 1, 0), scheme0._table[XTERM_GREEN_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);
Expand All @@ -146,6 +152,7 @@ namespace TerminalAppLocalTests

VERIFY_ARE_EQUAL(ARGB(0, 4, 4, 4), scheme0._defaultForeground);
VERIFY_ARE_EQUAL(ARGB(0, 5, 5, 5), scheme0._defaultBackground);
VERIFY_ARE_EQUAL(ARGB(0, 3, 3, 0), scheme0._selectionBackground);
VERIFY_ARE_EQUAL(ARGB(0, 3, 0, 0), scheme0._table[XTERM_RED_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 3, 0), scheme0._table[XTERM_GREEN_ATTR]);
VERIFY_ARE_EQUAL(ARGB(0, 0, 0, 2), scheme0._table[XTERM_BLUE_ATTR]);
Expand Down
15 changes: 13 additions & 2 deletions src/cascadia/LocalTests_TerminalApp/ProfileTests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,8 @@ namespace TerminalAppLocalTests
"name": "profile0",
"guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
"foreground": "#000000",
"background": "#010101"
"background": "#010101",
"selectionBackground": "#010101"
})" };
const std::string profile1String{ R"({
"name": "profile1",
Expand All @@ -106,7 +107,8 @@ namespace TerminalAppLocalTests
const std::string profile2String{ R"({
"name": "profile2",
"guid": "{6239a42c-1111-49a3-80bd-e8fdd045185c}",
"foreground": "#030303"
"foreground": "#030303",
"selectionBackground": "#020202"
})" };

const auto profile0Json = VerifyParseSucceeded(profile0String);
Expand All @@ -120,6 +122,9 @@ namespace TerminalAppLocalTests
VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());

VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());

VERIFY_ARE_EQUAL(L"profile0", profile0._name);

VERIFY_IS_FALSE(profile0._startingDirectory.has_value());
Expand All @@ -134,6 +139,9 @@ namespace TerminalAppLocalTests
VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());

VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._selectionBackground.value());

VERIFY_ARE_EQUAL(L"profile1", profile0._name);

VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
Expand All @@ -149,6 +157,9 @@ namespace TerminalAppLocalTests
VERIFY_IS_TRUE(profile0._defaultBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 1, 1, 1), profile0._defaultBackground.value());

VERIFY_IS_TRUE(profile0._selectionBackground.has_value());
VERIFY_ARE_EQUAL(ARGB(0, 2, 2, 2), profile0._selectionBackground.value());

VERIFY_ARE_EQUAL(L"profile2", profile0._name);

VERIFY_IS_TRUE(profile0._startingDirectory.has_value());
Expand Down
Loading