xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slight tweak of FaceRegistry::FaceOrAlias definition

Browse Source
This commit is contained in:
Maxime Coste 2017-09-01 17:32:38 +07:00
parent e66a5c78ad
commit 9baebbd186
2 changed files with 24 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/face_registry.cc
View File

@ -99,28 +99,28 @@ CandidateList FaceRegistry::complete_alias_name(StringView prefix,
FaceRegistry::FaceRegistry() FaceRegistry::FaceRegistry()
: m_aliases{ : m_aliases{
{ "Default", Face{ Color::Default, Color::Default } }, { "Default", {Face{ Color::Default, Color::Default }} },
{ "PrimarySelection", Face{ Color::White, Color::Blue } }, { "PrimarySelection", {Face{ Color::White, Color::Blue }} },
{ "SecondarySelection", Face{ Color::Black, Color::Blue } }, { "SecondarySelection", {Face{ Color::Black, Color::Blue }} },
{ "PrimaryCursor", Face{ Color::Black, Color::White } }, { "PrimaryCursor", {Face{ Color::Black, Color::White }} },
{ "SecondaryCursor", Face{ Color::Black, Color::White } }, { "SecondaryCursor", {Face{ Color::Black, Color::White }} },
{ "LineNumbers", Face{ Color::Default, Color::Default } }, { "LineNumbers", {Face{ Color::Default, Color::Default }} },
{ "LineNumberCursor", Face{ Color::Default, Color::Default, Attribute::Reverse } }, { "LineNumberCursor", {Face{ Color::Default, Color::Default, Attribute::Reverse }} },
{ "LineNumbersWrapped", Face{ Color::Default, Color::Default, Attribute::Italic } }, { "LineNumbersWrapped", {Face{ Color::Default, Color::Default, Attribute::Italic }} },
{ "MenuForeground", Face{ Color::White, Color::Blue } }, { "MenuForeground", {Face{ Color::White, Color::Blue }} },
{ "MenuBackground", Face{ Color::Blue, Color::White } }, { "MenuBackground", {Face{ Color::Blue, Color::White }} },
{ "MenuInfo", Face{ Color::Cyan, Color::Default } }, { "MenuInfo", {Face{ Color::Cyan, Color::Default }} },
{ "Information", Face{ Color::Black, Color::Yellow } }, { "Information", {Face{ Color::Black, Color::Yellow }} },
{ "Error", Face{ Color::Black, Color::Red } }, { "Error", {Face{ Color::Black, Color::Red }} },
{ "StatusLine", Face{ Color::Cyan, Color::Default } }, { "StatusLine", {Face{ Color::Cyan, Color::Default }} },
{ "StatusLineMode", Face{ Color::Yellow, Color::Default } }, { "StatusLineMode", {Face{ Color::Yellow, Color::Default }} },
{ "StatusLineInfo", Face{ Color::Blue, Color::Default } }, { "StatusLineInfo", {Face{ Color::Blue, Color::Default }} },
{ "StatusLineValue", Face{ Color::Green, Color::Default } }, { "StatusLineValue", {Face{ Color::Green, Color::Default }} },
{ "StatusCursor", Face{ Color::Black, Color::Cyan } }, { "StatusCursor", {Face{ Color::Black, Color::Cyan }} },
{ "Prompt", Face{ Color::Yellow, Color::Default } }, { "Prompt", {Face{ Color::Yellow, Color::Default }} },
{ "MatchingChar", Face{ Color::Default, Color::Default, Attribute::Bold } }, { "MatchingChar", {Face{ Color::Default, Color::Default, Attribute::Bold }} },
{ "BufferPadding", Face{ Color::Blue, Color::Default } }, { "BufferPadding", {Face{ Color::Blue, Color::Default }} },
{ "Whitespace", Face{ Color::Default, Color::Default } }, { "Whitespace", {Face{ Color::Default, Color::Default }} },
} }
{} {}

7
src/face_registry.hh
View File

@ -23,12 +23,9 @@ public:
private: private:
struct FaceOrAlias struct FaceOrAlias
{ {
Face face; Face face = {};
String alias; String alias = {};
FaceOrAlias(Face face = Face{}) : face(face) {}
}; };
using AliasMap = HashMap<String, FaceOrAlias, MemoryDomain::Faces>; using AliasMap = HashMap<String, FaceOrAlias, MemoryDomain::Faces>;
AliasMap m_aliases; AliasMap m_aliases;
}; };