richedit: Fixed bug preventing bold from being set with EM_SETCHARFORMAT.

Previously bold needed to be set by setting CFM_WEIGHT in the CHARFORMAT2 structure, and then setting the appropriate wWeight value. This approach isn't even supported in version 3.0 of the richedit control. Now bold can be set/unset properly for Windows or Wine using CFE_BOLD in dwEffects and with CFM_BOLD set in the dwMask flag.

richedit: Fixed bug preventing bold from being set with EM_SETCHARFORMAT.
cb1d7bec · Dylan Smith · Alexandre Julliard · 60757ca6 · cb1d7bec
Commit cb1d7bec authored Jun 25, 2008 by Dylan Smith Committed by Alexandre Julliard Jun 26, 2008
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

style.c dlls/riched20/style.c +9 -0

No files found.
--- a/dlls/riched20/style.c
+++ b/dlls/riched20/style.c
@@ -221,6 +221,15 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style)
      s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ?
          CFU_CF1UNDERLINE : CFU_UNDERLINENONE;
  }
+  if (style->dwMask & CFM_BOLD && !(style->dwMask & CFM_WEIGHT))
+  {
+      s->fmt.wWeight = (style->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL;
+  } else if (style->dwMask & CFM_WEIGHT && !(style->dwMask & CFM_BOLD)) {
+      if (style->wWeight > FW_NORMAL)
+          s->fmt.dwEffects |= CFE_BOLD;
+      else
+          s->fmt.dwEffects &= ~CFE_BOLD;
+  }
  return s;
 }