From 5bfb363744dd7d4296f9c95e40cac48d8c8b4a9b Mon Sep 17 00:00:00 2001 From: Vadim Lopatin Date: Tue, 10 Mar 2015 16:03:15 +0300 Subject: [PATCH] fix underline; log widget improvements --- src/dlangui/graphics/fonts.d | 3 +-- src/dlangui/widgets/editors.d | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dlangui/graphics/fonts.d b/src/dlangui/graphics/fonts.d index 4fbc0c1f..ddaf618a 100644 --- a/src/dlangui/graphics/fonts.d +++ b/src/dlangui/graphics/fonts.d @@ -377,9 +377,8 @@ class Font : RefCountedObject { dchar ch = text[i]; uint color = i < charProps.length ? charProps[i].color : charProps[$ - 1].color; customizedTextFlags = (i < charProps.length ? charProps[i].textFlags : charProps[$ - 1].textFlags) | textFlags; + underline = (customizedTextFlags & TextFlag.Underline) != 0; // turn off underline after hot key - if (!(customizedTextFlags & TextFlag.Underline)) - underline = false; if (ch == '&' && (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.HotKeys | TextFlag.UnderlineHotKeysWhenAltPressed))) { if (textFlags & (TextFlag.UnderlineHotKeys | TextFlag.UnderlineHotKeysWhenAltPressed)) underline = true; // turn ON underline for hot key diff --git a/src/dlangui/widgets/editors.d b/src/dlangui/widgets/editors.d index 1f9e6be7..d81eaeb8 100644 --- a/src/dlangui/widgets/editors.d +++ b/src/dlangui/widgets/editors.d @@ -2378,6 +2378,7 @@ class LogWidget : EditBox { minFontSize(8).maxFontSize(32); // allow font zoom with Ctrl + MouseWheel onThemeChanged(); } + /// append lines to the end of text void appendText(dstring text) { if (text.length == 0)