CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4063 from RaiKoHoff/Dev_Master

Browse Source 
"Text File" Scheme: using Common (2nd) Base Font
This commit is contained in:
Pairi Daiza 2022-05-02 12:32:40 +02:00 committed by GitHub
commit 7d313adeb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/StyleLexers/styleLexStandard.c
View File

@ -62,8 +62,8 @@ EDITLEXER lexTEXT =
{
SCLEX_NULL, "null", IDS_LEX_TEXT_FILES, L"Text Files", L"txt; text; tmp; log; asc; doc; scp; wtx", L"",
&KeyWords_NULL,{
{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:$Text", L"" },
//{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" },
//~{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"font:$Text", L"" },
{ {STYLE_DEFAULT}, IDS_LEX_STR_63126, L"Default", L"", L"" },
{ {STYLE_LINENUMBER}, IDS_LEX_STD_MARGIN, L"Margins and Line Numbers", L"font:Consolas; size:-2", L"" },
{ {SCI_SETEXTRAASCENT + SCI_SETEXTRADESCENT}, IDS_LEX_STD_X_SPC, L"Extra Line Spacing (Size)", L"size:-1", L"" },
EDITLEXER_SENTINEL

2
src/Styles.c
View File

@ -2810,10 +2810,10 @@ static inline bool GetDefaultCodeFont(LPWSTR pwchFontName, int cchFont)
}
LPCWSTR const FontNamePrioList[] = {
L"Cascadia Mono",
L"Cascadia Code",
L"Fira Code",
L"Source Code Pro",
L"Cascadia Mono",
L"Roboto Mono",
L"DejaVu Sans Mono",
L"Consolas",

4
src/Version.h
View File

@ -95,7 +95,9 @@
#define VER_CPL MS Visual C++ 2022 v17.0.(0-1)
#endif
#elif (_MSC_VER == 1929)
#if (_MSC_FULL_VER >= 192930142)
#if (_MSC_FULL_VER >= 192930143)
#define VER_CPL MS Visual C++ 2019 v16.11.13
#elif (_MSC_FULL_VER >= 192930142)
#define VER_CPL MS Visual C++ 2019 v16.11.12
#elif (_MSC_FULL_VER >= 192930141)
#define VER_CPL MS Visual C++ 2019 v16.11.11