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

Fix Change History margin visual glichy under dark mode 

Ref: https://community.notepad-plus-plus.org/topic/23510/notepad-v8-4-6-release-candidate/2?_=1663857801779
pull/12224/head
Don Ho 2022-09-22 19:28:08 +02:00
parent 5a24dc77f9
commit 848b412cf7
24 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/installer/themes/Bespin.xml
View File

@ -784,6 +784,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" bgColor="2A211C" fontSize="8" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="E5C138" bgColor="4C4A41" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="4C4A41" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="4C4A41" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" fontSize="" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="2E3436" bgColor="6A5448" />

1
PowerEditor/installer/themes/Black board.xml
View File

@ -782,6 +782,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" bgColor="F3F3F3" fontSize="8" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436" />

1
PowerEditor/installer/themes/Choco.xml
View File

@ -782,6 +782,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" bgColor="F3F3F3" fontSize="8" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" fontSize="" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436" />

1
PowerEditor/installer/themes/DansLeRuSH-Dark.xml
View File

@ -894,6 +894,7 @@ Installation : Copy this file to "%APPDATA%\Notepad++\themes" and in a portable
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" bgColor="2E2E2E" fontStyle="0" fontSize="9" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="8F8F8F" bgColor="363636" fontName="" fontStyle="0" fontSize="9" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="363636" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="363636" />
<WidgetStyle name="Fold" styleID="0" fgColor="4D4D4D" bgColor="2E2E2E" fontStyle="0" fontSize="" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="2E2E2E" bgColor="2E2E2E" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="666666" fontStyle="0" bgColor="00FF00" fontSize="" />

1
PowerEditor/installer/themes/DarkModeDefault.xml
View File

@ -1424,6 +1424,7 @@ License: GPL2
<WidgetStyle name="Edge colour" styleID="0" fgColor="4F5F5F" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="8A8A8A" bgColor="0C0C0C" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="0C0C0C" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="0C0C0C" />
<WidgetStyle name="Fold" styleID="0" fgColor="707070" bgColor="101010" />
<WidgetStyle name="Fold active" styleID="0" fgColor="7F9F7F" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="181818" bgColor="101010" />

1
PowerEditor/installer/themes/Deep Black.xml
View File

@ -786,6 +786,7 @@ https://notepad-plus-plus.org/donate/
<WidgetStyle name="Edge colour" styleID="0" fgColor="80FFFF" bgColor="112435" fontSize="" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="C0C0C0" bgColor="333333" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="333333" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="333333" />
<WidgetStyle name="Fold" styleID="0" fgColor="6A6A6A" bgColor="333333" fontSize="8" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="6A6A6A" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="1A1A1A" bgColor="1A1A1A" fontSize="8" fontStyle="0" />

1
PowerEditor/installer/themes/Hello Kitty.xml
View File

@ -757,6 +757,7 @@ so your enhanced file can be included in Notepad++ future release.
<WidgetStyle name="Edge colour" styleID="0" fgColor="80FFFF" bgColor="112435" fontSize="" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="FFFFFF" bgColor="FF80FF" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="FF80FF" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="FF80FF" />
<WidgetStyle name="Fold" styleID="0" fgColor="FFFFFF" bgColor="FF80C0" fontSize="8" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="FFFFFF" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="FF80C0" bgColor="FF80C0" fontSize="8" fontStyle="0" />

1
PowerEditor/installer/themes/HotFudgeSundae.xml
View File

@ -920,6 +920,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="8B642B" fontStyle="0" bgColor="112435" fontSize="" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="8B642B" bgColor="43250B" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="43250B" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="43250B" />
<WidgetStyle name="Fold" styleID="0" fgColor="8B642B" bgColor="43250B" fontStyle="0" fontSize="8" />
<WidgetStyle name="Fold active" styleID="0" fgColor="CFBA28" fontStyle="0" bgColor="1A1A1A" fontSize="8" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="8B642B" bgColor="43250B" fontStyle="0" fontSize="" />

1
PowerEditor/installer/themes/Mono Industrial.xml
View File

@ -786,6 +786,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436" />

1
PowerEditor/installer/themes/Monokai.xml
View File

@ -802,6 +802,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436" />

1
PowerEditor/installer/themes/MossyLawn.xml
View File

@ -921,6 +921,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="003709" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="603d13" bgColor="7e8a28" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="7e8a28" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="7e8a28" />
<WidgetStyle name="Fold" styleID="0" fgColor="603d13" bgColor="7e8a28" />
<WidgetStyle name="Fold active" styleID="0" fgColor="FF0000" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="7e8a28" bgColor="7e8a28" />

1
PowerEditor/installer/themes/Navajo.xml
View File

@ -918,6 +918,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="181880" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="000000" bgColor="808080" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="808080" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="808080" />
<WidgetStyle name="Fold" styleID="0" fgColor="000000" bgColor="808080" />
<WidgetStyle name="Fold active" styleID="0" fgColor="FF0000" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="808080" bgColor="808080" />

1
PowerEditor/installer/themes/Obsidian.xml
View File

@ -787,6 +787,7 @@ Notepad++ Custom Style
<WidgetStyle name="Edge colour" styleID="0" fgColor="445257" bgColor="112435" fontSize="" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="81969A" bgColor="3F4B4E" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="3F4B4E" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="3F4B4E" />
<WidgetStyle name="Fold" styleID="0" fgColor="6A8088" bgColor="2F383C" fontSize="" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="6A8088" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="343F41" bgColor="343F41" fontSize="" fontStyle="0" />

1
PowerEditor/installer/themes/Plastic Code Wrap.xml
View File

@ -798,6 +798,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC" />
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436" />

1
PowerEditor/installer/themes/Ruby Blue.xml
View File

@ -635,6 +635,7 @@ http://sourceforge.net/donate/index.php?group_id=95717
<WidgetStyle name="Edge colour" styleID="0" fgColor="FFFFFF" bgColor="FF0000" fontSize="" fontStyle="1" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="FFFFFF" bgColor="1F4661" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="1F4661" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="1F4661" />
<WidgetStyle name="Fold" styleID="0" fgColor="FFFFFF" bgColor="F0804F" fontSize="" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="FFFFFF" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="4096BF" bgColor="3476A3" />

1
PowerEditor/installer/themes/Solarized-light.xml
View File

@ -929,6 +929,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="93A1A1" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="93A1A1" bgColor="EEE8D5" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="EEE8D5" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="EEE8D5" />
<WidgetStyle name="Fold" styleID="0" fgColor="93A1A1" bgColor="EEE8D5" />
<WidgetStyle name="Fold active" styleID="0" fgColor="DC322F" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="93A1A1" bgColor="EEE8D5" />

1
PowerEditor/installer/themes/Solarized.xml
View File

@ -929,6 +929,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="586E75" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="586E75" bgColor="073642" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="073642" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="073642" />
<WidgetStyle name="Fold" styleID="0" fgColor="586E75" bgColor="073642" />
<WidgetStyle name="Fold active" styleID="0" fgColor="DC322F" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="586E75" bgColor="073642" />

1
PowerEditor/installer/themes/Twilight.xml
View File

@ -787,6 +787,7 @@ Credits:
<WidgetStyle name="Edge colour" styleID="0" fgColor="EEEEEC" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="EEEEEC" bgColor="2E3436" fontName="" fontStyle="0" fontSize="8" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="2E3436" />
<WidgetStyle name="Fold" styleID="0" fgColor="2E3436" bgColor="EEEEEC"/>
<WidgetStyle name="Fold active" styleID="0" fgColor="2E3436" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="555753" bgColor="2E3436"/>

1
PowerEditor/installer/themes/Vibrant Ink.xml
View File

@ -758,6 +758,7 @@ http://sourceforge.net/donate/index.php?group_id=95717
<WidgetStyle name="Edge colour" styleID="0" fgColor="80FFFF" bgColor="F3F3F3" fontSize="8" fontStyle="0" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="E4E4E4" bgColor="333333" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="333333" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="333333" />
<WidgetStyle name="Fold" styleID="0" fgColor="999999" bgColor="333333" fontSize="" fontStyle="0" />
<WidgetStyle name="Fold active" styleID="0" fgColor="999999" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="222222" bgColor="111111" />

1
PowerEditor/installer/themes/Zenburn.xml
View File

@ -1424,6 +1424,7 @@ License: GPL2
<WidgetStyle name="Edge colour" styleID="0" fgColor="4F5F5F" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="8A8A8A" bgColor="0C0C0C" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="0C0C0C" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="0C0C0C" />
<WidgetStyle name="Fold" styleID="0" fgColor="707070" bgColor="101010" />
<WidgetStyle name="Fold active" styleID="0" fgColor="7F9F7F" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="181818" bgColor="101010" />

1
PowerEditor/installer/themes/khaki.xml
View File

@ -918,6 +918,7 @@ Installation:
<WidgetStyle name="Edge colour" styleID="0" fgColor="afaf87" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="5f5f00" bgColor="afaf87" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="afaf87" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="afaf87" />
<WidgetStyle name="Fold" styleID="0" fgColor="5f5f00" bgColor="afaf87" />
<WidgetStyle name="Fold active" styleID="0" fgColor="af0000" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="afaf87" bgColor="afaf87" />

1
PowerEditor/installer/themes/vim Dark Blue.xml
View File

@ -750,6 +750,7 @@
<WidgetStyle name="Edge colour" styleID="0" fgColor="80FFFF" />
<WidgetStyle name="Line number margin" styleID="33" fgColor="FFFFFF" bgColor="000040" fontName="" fontStyle="0" fontSize="" />
<WidgetStyle name="Bookmark margin" styleID="0" bgColor="000040" />
<WidgetStyle name="Change History margin" styleID="0" bgColor="000040" />
<WidgetStyle name="Fold" styleID="0" fgColor="FFFFFF" bgColor="000040" />
<WidgetStyle name="Fold active" styleID="0" fgColor="FFFFFF" />
<WidgetStyle name="Fold margin" styleID="0" fgColor="000040" bgColor="000040" />

11
PowerEditor/src/Parameters.cpp
View File

@ -3644,17 +3644,6 @@ bool NppParameters::feedStylerArray(TiXmlNode *node)
_widgetStyleArray.addStyler(0, eolColorkNode);
}
pStyle = _widgetStyleArray.findByName(TEXT("Change History margin"));
if (!pStyle)
{
TiXmlNode* changeHistoryNode = globalStyleRoot->InsertEndChild(TiXmlElement(TEXT("WidgetStyle")));
changeHistoryNode->ToElement()->SetAttribute(TEXT("name"), TEXT("Change History margin"));
changeHistoryNode->ToElement()->SetAttribute(TEXT("styleID"), TEXT("0"));
changeHistoryNode->ToElement()->SetAttribute(TEXT("bgColor"), TEXT("E0E0E0"));
_widgetStyleArray.addStyler(0, changeHistoryNode);
}
return true;
}

6
PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
View File

@ -2741,14 +2741,12 @@ void ScintillaEditView::performGlobalStyles()
execute(SCI_SETMARGINTYPEN, _SC_MARGE_SYMBOL, SC_MARGIN_COLOUR);
execute(SCI_SETMARGINBACKN, _SC_MARGE_SYMBOL, bookmarkMarginColor);
COLORREF changeHistoryMarginColor = veryLiteGrey;
pStyle = stylers.findByName(TEXT("Change History margin"));
if (pStyle)
{
changeHistoryMarginColor = pStyle->_bgColor;
execute(SCI_SETMARGINTYPEN, _SC_MARGE_CHANGEHISTORY, SC_MARGIN_COLOUR);
execute(SCI_SETMARGINBACKN, _SC_MARGE_CHANGEHISTORY, pStyle->_bgColor);
}
execute(SCI_SETMARGINTYPEN, _SC_MARGE_CHANGEHISTORY, SC_MARGIN_COLOUR);
execute(SCI_SETMARGINBACKN, _SC_MARGE_CHANGEHISTORY, changeHistoryMarginColor);
COLORREF urlHoveredFG = grey;
pStyle = stylers.findByName(TEXT("URL hovered"));