From: Peter T. <pe...@us...> - 2003-09-16 19:49:56
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1:/tmp/cvs-serv15869/JVCL3/run Modified Files: JvRichEdit.pas Log Message: - Mantis #1110 (TJvRichEdit - Font styles lost when Color is clDefault or clWindowText) Index: JvRichEdit.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvRichEdit.pas,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JvRichEdit.pas 28 Jul 2003 06:46:17 -0000 1.6 --- JvRichEdit.pas 16 Sep 2003 19:49:52 -0000 1.7 *************** *** 1253,1256 **** --- 1253,1260 ---- CFM_UNDERLINE or CFM_STRIKEOUT or CFM_FACE or CFM_COLOR; yHeight := Font.Size * 20; + if (Font.Color = clWindowText) or (Font.Color = clDefault) then + dwEffects := CFE_AUTOCOLOR + else + crTextColor := ColorToRGB(Font.Color); if fsBold in Font.Style then dwEffects := dwEffects or CFE_BOLD; *************** *** 1262,1269 **** dwEffects := dwEffects or CFE_STRIKEOUT; StrPLCopy(szFaceName, Font.Name, SizeOf(szFaceName)); - if (Font.Color = clWindowText) or (Font.Color = clDefault) then - dwEffects := CFE_AUTOCOLOR - else - crTextColor := ColorToRGB(Font.Color); dwMask := dwMask or CFM_CHARSET; bCharSet := Font.Charset; --- 1266,1269 ---- |