From f1c4ec82f2ac5b6b65a484ddee58071879e845d5 Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Tue, 20 Jan 2015 18:24:34 +0300 Subject: [PATCH] win32 font fixes; syntax highlight categories update --- src/dlangui/platforms/windows/win32fonts.d | 6 +++--- src/dlangui/widgets/editors.d | 1 + src/dlangui/widgets/srcedit.d | 7 ++++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/dlangui/platforms/windows/win32fonts.d b/src/dlangui/platforms/windows/win32fonts.d index bbc9886e..cb0287a8 100644 --- a/src/dlangui/platforms/windows/win32fonts.d +++ b/src/dlangui/platforms/windows/win32fonts.d @@ -259,14 +259,14 @@ class Win32Font : Font { lf.lfCharSet = ANSI_CHARSET; //DEFAULT_CHARSET; lf.lfFaceName[0..def.face.length] = def.face; lf.lfFaceName[def.face.length] = 0; - lf.lfHeight = size; //-size; + lf.lfHeight = -size; //size; //-size; lf.lfItalic = italic; 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.lfQuality = NONANTIALIASED_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; _hfont = CreateFontIndirectA(&lf); _drawbuf = new Win32ColorDrawBuf(1, 1); diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d index b88de533..9de1ebde 100644 --- a/src/dlangui/widgets/editors.d +++ b/src/dlangui/widgets/editors.d @@ -64,6 +64,7 @@ enum TokenCategory : ubyte { Comment_SingleLineDoc = (1 << TOKEN_CATEGORY_SHIFT) | 2,// documentation in single line comment Comment_MultyLine = (1 << TOKEN_CATEGORY_SHIFT) | 3, // multiline coment 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_Class = (2 << TOKEN_CATEGORY_SHIFT) | 1, // class name diff --git a/src/dlangui/widgets/srcedit.d b/src/dlangui/widgets/srcedit.d index d6749fc5..cebe5b6e 100644 --- a/src/dlangui/widgets/srcedit.d +++ b/src/dlangui/widgets/srcedit.d @@ -25,11 +25,12 @@ import dlangui.widgets.styles; class SourceEdit : EditBox { this(string ID) { super(ID); - fontFace = "Consolas,Courier New"; + fontFace = "Consolas,Lucida Console,Courier New"; fontFamily = FontFamily.MonoSpace; - fontSize = 18; + fontSize = 14; + fontWeight = 300; 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; } this() {