tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-27 15:54:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring - make tab color code on its correct place

Browse Source
This commit is contained in:
Don Ho 2024-07-28 12:34:30 +02:00
parent 6556b17ee2
commit 6b97e68cbb
8 changed files with 60 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
PowerEditor/src/Notepad_plus.cpp
View File

@ -2694,9 +2694,12 @@ void Notepad_plus::setupColorSampleBitmapsOnMainMenuItems()
{ IDM_SEARCH_GONEXTMARKER_DEF, SCE_UNIVERSAL_FOUND_STYLE, { IDM_SEARCH_GOPREVMARKER_DEF, IDM_SEARCH_MARKEDTOCLIP } } { IDM_SEARCH_GONEXTMARKER_DEF, SCE_UNIVERSAL_FOUND_STYLE, { IDM_SEARCH_GOPREVMARKER_DEF, IDM_SEARCH_MARKEDTOCLIP } }
}; };
NppParameters& nppParam = NppParameters::getInstance();
StyleArray& styleArray = nppParam.getMiscStylerArray();
for (size_t j = 0; j < sizeof(bitmapOnStyleMenuItemsInfo) / sizeof(bitmapOnStyleMenuItemsInfo[0]); ++j) for (size_t j = 0; j < sizeof(bitmapOnStyleMenuItemsInfo) / sizeof(bitmapOnStyleMenuItemsInfo[0]); ++j)
{ {
const Style * pStyle = NppParameters::getInstance().getMiscStylerArray().findByID(bitmapOnStyleMenuItemsInfo[j].styleIndic); const Style * pStyle = styleArray.findByID(bitmapOnStyleMenuItemsInfo[j].styleIndic);
if (pStyle) if (pStyle)
{ {
HBITMAP hNewBitmap = generateSolidColourMenuItemIcon(pStyle->_bgColor); HBITMAP hNewBitmap = generateSolidColourMenuItemIcon(pStyle->_bgColor);
@ -2712,7 +2715,7 @@ void Notepad_plus::setupColorSampleBitmapsOnMainMenuItems()
// Adds tab colour icons // Adds tab colour icons
for (int i = 0; i < 5; ++i) for (int i = 0; i < 5; ++i)
{ {
COLORREF colour = NppDarkMode::getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true); COLORREF colour = nppParam.getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true);
HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour); HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour);
SetMenuItemBitmaps(_mainMenuHandle, IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap); SetMenuItemBitmaps(_mainMenuHandle, IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap);
} }

43
PowerEditor/src/NppDarkMode.cpp
View File

@ -3424,47 +3424,4 @@ namespace NppDarkMode
return static_cast<INT_PTR>(NppDarkMode::onCtlColor(hdc)); return static_cast<INT_PTR>(NppDarkMode::onCtlColor(hdc));
} }
struct HLSColour
{
WORD _hue;
WORD _lightness;
WORD _saturation;
COLORREF toRGB() const { return ColorHLSToRGB(_hue, _lightness, _saturation); }
};
using IndividualTabColours = std::array<HLSColour, 5>;
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 constexpr IndividualTabColours individualTabHues { { HLSColour{37, 210, 150}, HLSColour{70, 210, 150}, HLSColour{144, 210, 150}, HLSColour{255, 210, 150}, HLSColour{195, 210, 150}}};
COLORREF getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated)
{
if (colourIndex < 0 || colourIndex > 4) return {};
HLSColour result;
if (themeDependant)
{
result = individualTabHuesFor_Dark[colourIndex];
if (saturated)
{
result._lightness = 146U;
result._saturation = std::min<WORD>(240U, result._saturation + 100U);
}
}
else
{
result = individualTabHues[colourIndex];
if (saturated)
{
result._lightness = 140U;
result._saturation = std::min<WORD>(240U, result._saturation + 30U);
}
}
return result.toRGB();
}
} }

2
PowerEditor/src/NppDarkMode.h
View File

@ -158,8 +158,6 @@ namespace NppDarkMode
HPEN getHotEdgePen(); HPEN getHotEdgePen();
HPEN getDisabledEdgePen(); HPEN getDisabledEdgePen();
COLORREF getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated);
void setBackgroundColor(COLORREF c); void setBackgroundColor(COLORREF c);
void setSofterBackgroundColor(COLORREF c); void setSofterBackgroundColor(COLORREF c);
void setHotBackgroundColor(COLORREF c); void setHotBackgroundColor(COLORREF c);

5
PowerEditor/src/NppNotification.cpp
View File

@ -516,10 +516,11 @@ BOOL Notepad_plus::notify(SCNotification *notification)
return TRUE; return TRUE;
//break; //break;
NppParameters& nppParam = NppParameters::getInstance();
if (!_tabPopupMenu.isCreated()) if (!_tabPopupMenu.isCreated())
{ {
std::vector<MenuItemUnit> itemUnitArray; std::vector<MenuItemUnit> itemUnitArray;
NppParameters& nppParam = NppParameters::getInstance();
if (nppParam.hasCustomTabContextMenu()) if (nppParam.hasCustomTabContextMenu())
{ {
@ -575,7 +576,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
// Adds colour icons // Adds colour icons
for (int i = 0; i < 5; ++i) for (int i = 0; i < 5; ++i)
{ {
COLORREF colour = NppDarkMode::getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true); COLORREF colour = nppParam.getIndividualTabColour(i, NppDarkMode::isDarkMenuEnabled(), true);
HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour); HBITMAP hBitmap = generateSolidColourMenuItemIcon(colour);
SetMenuItemBitmaps(_tabPopupMenu.getMenuHandle(), IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap); SetMenuItemBitmaps(_tabPopupMenu.getMenuHandle(), IDM_VIEW_TAB_COLOUR_1 + i, MF_BYCOMMAND, hBitmap, hBitmap);
} }

46
PowerEditor/src/Parameters.cpp
View File

@ -8819,3 +8819,49 @@ EolType convertIntToFormatType(int value, EolType defvalue)
return defvalue; return defvalue;
} }
} }
#include <array>
struct HLSColour
{
WORD _hue;
WORD _lightness;
WORD _saturation;
COLORREF toRGB() const { return ColorHLSToRGB(_hue, _lightness, _saturation); }
};
using IndividualTabColours = std::array<HLSColour, 5>;
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 constexpr IndividualTabColours individualTabHues{ { HLSColour{37, 210, 150}, HLSColour{70, 210, 150}, HLSColour{144, 210, 150}, HLSColour{255, 210, 150}, HLSColour{195, 210, 150}} };
COLORREF NppParameters::getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated)
{
if (colourIndex < 0 || colourIndex > 4) return {};
HLSColour result;
if (themeDependant)
{
result = individualTabHuesFor_Dark[colourIndex];
if (saturated)
{
result._lightness = 146U;
result._saturation = std::min<WORD>(240U, result._saturation + 100U);
}
}
else
{
result = individualTabHues[colourIndex];
if (saturated)
{
result._lightness = 140U;
result._saturation = std::min<WORD>(240U, result._saturation + 30U);
}
}
return result.toRGB();
}

2
PowerEditor/src/Parameters.h
View File

@ -2003,6 +2003,8 @@ public:
void setTheWarningHasBeenGiven(bool isEnabled) { _theWarningHasBeenGiven = isEnabled; }; void setTheWarningHasBeenGiven(bool isEnabled) { _theWarningHasBeenGiven = isEnabled; };
bool theWarningHasBeenGiven() const { return _theWarningHasBeenGiven; } bool theWarningHasBeenGiven() const { return _theWarningHasBeenGiven; }
COLORREF getIndividualTabColour(int colourIndex, bool themeDependant, bool saturated);
private: private:
void getLangKeywordsFromXmlTree(); void getLangKeywordsFromXmlTree();
bool getUserParametersFromXmlTree(); bool getUserParametersFromXmlTree();

5
PowerEditor/src/WinControls/TabBar/TabBar.cpp
View File

@ -1254,6 +1254,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
// draw highlights on tabs (top bar for active tab / darkened background for inactive tab) // draw highlights on tabs (top bar for active tab / darkened background for inactive tab)
RECT barRect = rect; RECT barRect = rect;
NppParameters& nppParam = NppParameters::getInstance();
if (isSelected) if (isSelected)
{ {
hBrush = ::CreateSolidBrush(colorActiveBg); hBrush = ::CreateSolidBrush(colorActiveBg);
@ -1279,7 +1280,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
if (individualColourId != -1) if (individualColourId != -1)
{ {
topBarColour = NppDarkMode::getIndividualTabColour(individualColourId, isDarkMode, isFocused); topBarColour = nppParam.getIndividualTabColour(individualColourId, isDarkMode, isFocused);
} }
hBrush = ::CreateSolidBrush(topBarColour); hBrush = ::CreateSolidBrush(topBarColour);
@ -1299,7 +1300,7 @@ void TabBarPlus::drawItem(DRAWITEMSTRUCT *pDrawItemStruct, bool isDarkMode)
} }
else if (individualColourId != -1) else if (individualColourId != -1)
{ {
brushColour = NppDarkMode::getIndividualTabColour(individualColourId, isDarkMode, false); brushColour = nppParam.getIndividualTabColour(individualColourId, isDarkMode, false);
} }
else else
{ {

2
PowerEditor/src/WinControls/VerticalFileSwitcher/VerticalFileSwitcher.cpp
View File

@ -157,7 +157,7 @@ LRESULT VerticalFileSwitcher::listViewNotifyCustomDraw(HWND hWnd, UINT uMsg, WPA
if (colorID != -1) if (colorID != -1)
{ {
bgColor = NppDarkMode::getIndividualTabColour(colorID, isThemeDark, false); bgColor = NppParameters::getInstance().getIndividualTabColour(colorID, isThemeDark, false);
applyColor = true; applyColor = true;
} }
else if (isThemeDark) else if (isThemeDark)