Alexander Nicolaysen Sørnes : wordpad: Clean up font effects toggling code.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8710108b24a4b8267be85101b25265f5603a1726
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8710108b24a4b8267be85101b25265f5603a1726

Author: Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
Date:   Sat Sep  8 20:23:26 2007 +0200

wordpad: Clean up font effects toggling code.

---

 programs/wordpad/wordpad.c |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index 8e77614..4eb7b0f 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2798,18 +2798,26 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
     case ID_FORMAT_UNDERLINE:
         {
         CHARFORMAT2W fmt;
-        int mask = CFM_BOLD;
-        if (LOWORD(wParam) == ID_FORMAT_ITALIC) mask = CFM_ITALIC;
-        if (LOWORD(wParam) == ID_FORMAT_UNDERLINE) mask = CFM_UNDERLINE;
+        int effects = CFE_BOLD;
 
         ZeroMemory(&fmt, sizeof(fmt));
         fmt.cbSize = sizeof(fmt);
         SendMessageW(hwndEditor, EM_GETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
-        if (!(fmt.dwMask&mask))
-            fmt.dwEffects |= mask;
-        else
-            fmt.dwEffects ^= mask;
-        fmt.dwMask = mask;
+
+        fmt.dwMask = CFM_BOLD;
+
+        if (LOWORD(wParam) == ID_FORMAT_ITALIC)
+        {
+            effects = CFE_ITALIC;
+            fmt.dwMask = CFM_ITALIC;
+        } else if (LOWORD(wParam) == ID_FORMAT_UNDERLINE)
+        {
+            effects = CFE_UNDERLINE;
+            fmt.dwMask = CFM_UNDERLINE;
+        }
+
+        fmt.dwEffects ^= effects;
+
         SendMessageW(hwndEditor, EM_SETCHARFORMAT, SCF_SELECTION, (LPARAM)&fmt);
         break;
         }