pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

richmemo: improve win32 numbering

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3842 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
skalogryz
2014-12-17 03:32:59 +00:00
parent 42b8235d52
commit 4cae993724
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
components/richmemo/win32/win32richmemo.pas
View File

@@ -610,6 +610,7 @@ begin
Result:=False;
if not Assigned(RichEditManager) or not Assigned(AWinControl) then Exit;
InitParaNumbering(ANumber);
eventmask:=RichEditManager.SetEventMask(AWinControl.Handle, 0);
RichEditManager.GetPara2(AWinControl.Handle, TextStart, para);
RichEditManager.SetEventMask(AWinControl.Handle, eventmask);
@@ -628,8 +629,14 @@ begin
else
ANumber.Style:=pnNone;
end;
if para.wNumberingStyle or PFNS_PLAIN > 0 then
ANumber.SepChar:=SepNone
else if para.wNumberingStyle or PFNS_PERIOD > 0 then
ANumber.SepChar:=SepDot
else if (ANumber.Style<>pnNone) and ((para.wNumberingStyle and PFNS_SOMESEPCHAR)= 0) then
ANumber.SepChar:=SepPar;
ANumber.Indent:=para.wNumberingTab/20;
Result:=true
Result:=true;
end;
class procedure TWin32WSCustomRichMemo.SetParaNumbering(
@@ -637,7 +644,8 @@ class procedure TWin32WSCustomRichMemo.SetParaNumbering(
const ANumber: TIntParaNumbering);
var
para : PARAFORMAT2;
eventmask: INteger;
eventmask: Integer;
numbstyle: Integer;
begin
if not Assigned(RichEditManager) or not Assigned(AWinControl) then Exit;
FillChar(para, SizeOf(para), 0);
@@ -645,6 +653,13 @@ begin
para.cbSize:=sizeof(para);
para.dwMask:=
PFM_NUMBERING or PFM_NUMBERINGTAB;
numbstyle:=0;
case ANumber.SepChar of
SepPar: numbstyle:=numbstyle or PFNS_PAREN;
SepDot: numbstyle:=numbstyle or PFNS_PERIOD;
SepNone: numbstyle:=numbstyle or PFNS_PLAIN;
end;
case ANumber.Style of
pnNone: para.wNumbering:=0;
pnBullet: para.wNumbering:=PFN_BULLET;
@@ -652,7 +667,7 @@ begin
para.wNumbering:=PFN_ARABIC;
para.dwMask:=para.dwMask or PFM_NUMBERINGSTART;
para.wNumberingStart:=ANumber.NumberStart;
para.wNumberingStyle:=PFNS_NEWNUMBER;
if ANumber.ForceNewNum then numbstyle:=numbstyle or PFNS_NEWNUMBER;
end;
pnLowLetter: para.wNumbering:=PFN_LCLETTER;
pnLowRoman: para.wNumbering:=PFN_LCROMAN;
@@ -664,6 +679,10 @@ begin
para.dwMask:=para.dwMask or PFM_NUMBERINGSTART;
end;
end;
if numbstyle<> 0 then begin
para.dwMask:=para.dwMask or PFM_NUMBERINGSTYLE;
para.wNumberingStyle:=numbstyle;
end;
para.wNumberingTab:=round(ANumber.Indent*20);
eventmask:=RichEditManager.SetEventMask(AWinControl.Handle, 0);