Huw Davies : wordpad: Improve the indentation of bulleted lists.

[Alexandre Julliard]

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

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Fri Oct  7 10:49:37 2016 +0100

wordpad: Improve the indentation of bulleted lists.

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 programs/wordpad/wordpad.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c
index bb34f2e..ea6e11d 100644
--- a/programs/wordpad/wordpad.c
+++ b/programs/wordpad/wordpad.c
@@ -2353,22 +2353,28 @@ static LRESULT OnCommand( HWND hWnd, WPARAM wParam, LPARAM lParam)
 
     case ID_BULLET:
         {
-            PARAFORMAT pf;
+            PARAFORMAT2 pf;
 
             pf.cbSize = sizeof(pf);
             pf.dwMask = PFM_NUMBERING;
             SendMessageW(hwndEditor, EM_GETPARAFORMAT, 0, (LPARAM)&pf);
 
-            pf.dwMask |=  PFM_OFFSET;
+            pf.dwMask = PFM_NUMBERING | PFM_NUMBERINGSTART | PFM_NUMBERINGTAB | PFM_OFFSET | PFM_OFFSETINDENT;
 
             if(pf.wNumbering == PFN_BULLET)
             {
                 pf.wNumbering = 0;
+                pf.wNumberingStart = 0;
+                pf.wNumberingTab = 0;
                 pf.dxOffset = 0;
+                pf.dxStartIndent = -360;
             } else
             {
                 pf.wNumbering = PFN_BULLET;
-                pf.dxOffset = 720;
+                pf.wNumberingStart = 1;
+                pf.wNumberingTab = 360;
+                pf.dxOffset = 360;
+                pf.dxStartIndent = 360;
             }
 
             SendMessageW(hwndEditor, EM_SETPARAFORMAT, 0, (LPARAM)&pf);