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

fix underlining

This commit is contained in:
Vadim Lopatin 2015-02-10 16:06:25 +03:00
parent 1733394bb1
commit 02526cbbb3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/dlangui/graphics/fonts.d
View File

@ -377,6 +377,9 @@ 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;
// 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
@ -393,9 +396,9 @@ class Font : RefCountedObject {
// draw underline
if (xx2 > xx)
buf.fillRect(Rect(x + xx, underlineY, x + xx2, underlineY + underlineHeight), color);
// turn off underline after hot key
if (!(customizedTextFlags & TextFlag.Underline))
underline = false;
// turn off underline after hot key
if (!(customizedTextFlags & TextFlag.Underline))
underline = false;
}
if (ch == ' ' || ch == '\t')