forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32 font fixes; syntax highlight categories update

This commit is contained in:
Vadim Lopatin 2015-01-20 18:24:34 +03:00
parent 312ecfa618
commit f1c4ec82f2
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dlangui/platforms/windows/win32fonts.d
View File

@ -259,14 +259,14 @@ class Win32Font : Font {
lf.lfCharSet = ANSI_CHARSET; //DEFAULT_CHARSET; lf.lfCharSet = ANSI_CHARSET; //DEFAULT_CHARSET;
lf.lfFaceName[0..def.face.length] = def.face; lf.lfFaceName[0..def.face.length] = def.face;
lf.lfFaceName[def.face.length] = 0; lf.lfFaceName[def.face.length] = 0;
lf.lfHeight = size; //-size; lf.lfHeight = -size; //size; //-size;
lf.lfItalic = italic; lf.lfItalic = italic;
lf.lfWeight = weight; lf.lfWeight = weight;
lf.lfOutPrecision = OUT_OUTLINE_PRECIS; //OUT_TT_ONLY_PRECIS; lf.lfOutPrecision = OUT_TT_ONLY_PRECIS; //OUT_OUTLINE_PRECIS; //OUT_TT_ONLY_PRECIS;
lf.lfClipPrecision = CLIP_DEFAULT_PRECIS; lf.lfClipPrecision = CLIP_DEFAULT_PRECIS;
//lf.lfQuality = NONANTIALIASED_QUALITY; //ANTIALIASED_QUALITY; //lf.lfQuality = NONANTIALIASED_QUALITY; //ANTIALIASED_QUALITY;
//lf.lfQuality = PROOF_QUALITY; //ANTIALIASED_QUALITY; //lf.lfQuality = PROOF_QUALITY; //ANTIALIASED_QUALITY;
lf.lfQuality = size < 18 ? NONANTIALIASED_QUALITY : PROOF_QUALITY; //ANTIALIASED_QUALITY; lf.lfQuality = antialiased ? NONANTIALIASED_QUALITY : ANTIALIASED_QUALITY; //PROOF_QUALITY; //ANTIALIASED_QUALITY; //size < 18 ? NONANTIALIASED_QUALITY : PROOF_QUALITY; //ANTIALIASED_QUALITY;
lf.lfPitchAndFamily = def.pitchAndFamily; lf.lfPitchAndFamily = def.pitchAndFamily;
_hfont = CreateFontIndirectA(&lf); _hfont = CreateFontIndirectA(&lf);
_drawbuf = new Win32ColorDrawBuf(1, 1); _drawbuf = new Win32ColorDrawBuf(1, 1);

1
src/dlangui/widgets/editors.d
View File

@ -64,6 +64,7 @@ enum TokenCategory : ubyte {
Comment_SingleLineDoc = (1 << TOKEN_CATEGORY_SHIFT) | 2,// documentation in single line comment Comment_SingleLineDoc = (1 << TOKEN_CATEGORY_SHIFT) | 2,// documentation in single line comment
Comment_MultyLine = (1 << TOKEN_CATEGORY_SHIFT) | 3, // multiline coment Comment_MultyLine = (1 << TOKEN_CATEGORY_SHIFT) | 3, // multiline coment
Comment_MultyLineDoc = (1 << TOKEN_CATEGORY_SHIFT) | 4, // documentation in multiline comment Comment_MultyLineDoc = (1 << TOKEN_CATEGORY_SHIFT) | 4, // documentation in multiline comment
Comment_Documentation = (1 << TOKEN_CATEGORY_SHIFT) | 5,// documentation comment
Identifier = (2 << TOKEN_CATEGORY_SHIFT), // identifier (exact subcategory is unknown) Identifier = (2 << TOKEN_CATEGORY_SHIFT), // identifier (exact subcategory is unknown)
Identifier_Class = (2 << TOKEN_CATEGORY_SHIFT) | 1, // class name Identifier_Class = (2 << TOKEN_CATEGORY_SHIFT) | 1, // class name

7
src/dlangui/widgets/srcedit.d
View File

@ -25,11 +25,12 @@ import dlangui.widgets.styles;
class SourceEdit : EditBox { class SourceEdit : EditBox {
this(string ID) { this(string ID) {
super(ID); super(ID);
fontFace = "Consolas,Courier New"; fontFace = "Consolas,Lucida Console,Courier New";
fontFamily = FontFamily.MonoSpace; fontFamily = FontFamily.MonoSpace;
fontSize = 18; fontSize = 14;
fontWeight = 300;
layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT); layoutWidth(FILL_PARENT).layoutHeight(FILL_PARENT);
minFontSize(12).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel minFontSize(10).maxFontSize(75); // allow font zoom with Ctrl + MouseWheel
_showLineNumbers = true; _showLineNumbers = true;
} }
this() { this() {