tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change colours for applying to tab more distiguishable 

And simplify the code.

Ref: https://community.notepad-plus-plus.org/topic/23513/notepad-v8-4-6-release-candidate-2/3?_=1663982940040

Fix partially #12223
This commit is contained in:
Don Ho 2022-09-24 03:26:58 +02:00
parent 466053dc99
commit 18971709f5
1 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PowerEditor/src/NppDarkMode.cpp
View File

@ -2868,29 +2868,9 @@ namespace NppDarkMode
using IndividualTabColours = std::array<HLSColour, 5>;
static constexpr IndividualTabColours individualTabHuesFor_Dark { { HLSColour{0, 40, 60}, HLSColour{70, 40, 60}, HLSColour{144, 40, 60}, HLSColour{13, 40, 60}, HLSColour{195, 40, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkRed { { HLSColour{0, 60, 60}, HLSColour{70, 50, 60}, HLSColour{144, 50, 60}, HLSColour{13, 50, 60}, HLSColour{195, 50, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkGreen { { HLSColour{0, 50, 60}, HLSColour{70, 50, 60}, HLSColour{144, 50, 60}, HLSColour{13, 50, 60}, HLSColour{195, 50, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkBlue { { HLSColour{0, 50, 60}, HLSColour{70, 50, 60}, HLSColour{144, 50, 60}, HLSColour{13, 50, 60}, HLSColour{195, 50, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkPurple{ { HLSColour{0, 50, 60}, HLSColour{70, 50, 60}, HLSColour{144, 50, 60}, HLSColour{13, 50, 60}, HLSColour{195, 60, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkCyan { { HLSColour{0, 60, 60}, HLSColour{70, 60, 60}, HLSColour{144, 70, 60}, HLSColour{13, 60, 60}, HLSColour{195, 60, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_DarkOlive { { HLSColour{0, 60, 60}, HLSColour{70, 60, 60}, HLSColour{144, 60, 60}, HLSColour{13, 60, 60}, HLSColour{195, 60, 60} } };
static constexpr IndividualTabColours individualTabHuesFor_Dark { { HLSColour{37, 60, 60}, HLSColour{70, 60, 60}, HLSColour{144, 70, 60}, HLSColour{255, 60, 60}, HLSColour{195, 60, 60} } };
static const IndividualTabColours individualTabHues { { HLSColour{37, 210, 150}, HLSColour{70, 210, 150}, HLSColour{144, 210, 150}, HLSColour{255, 210, 150}, HLSColour{195, 210, 150}}};
static const IndividualTabColours individualTabHues { { HLSColour{0, 210, 150}, HLSColour{70, 210, 150}, HLSColour{144, 210, 150}, HLSColour{13, 210, 150}, HLSColour{195, 210, 150} } };
const IndividualTabColours& getIndividualThemeDependantColours()
{
switch (g_colorToneChoice)
{
case redTone: return individualTabHuesFor_DarkRed;
case greenTone: return individualTabHuesFor_DarkGreen;
case blueTone: return individualTabHuesFor_DarkBlue;
case purpleTone: return individualTabHuesFor_DarkPurple;
case cyanTone: return individualTabHuesFor_DarkCyan;
case oliveTone: return individualTabHuesFor_DarkOlive;
default: return individualTabHuesFor_Dark;
}
}
COLORREF getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated)
{
@ -2899,7 +2879,7 @@ namespace NppDarkMode
HLSColour result;
if (themeDependant)
{
result = getIndividualThemeDependantColours()[colourIndex];
result = individualTabHuesFor_Dark[colourIndex];
if (saturated)
{