paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 20:19:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: remove redundant line breaks when reading from lfm.Patch by Vladimir Zhirov issue #18278.

Browse Source 
git-svn-id: trunk@30168 -
This commit is contained in:
zeljko 2011-04-04 07:53:38 +00:00
parent 335de8955d
commit fe743caa95
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/interfaces/qt/qtprivate.pp
View File

@ -89,6 +89,7 @@ type
private
FTextChanged: Boolean; // Inform TQtMemoStrings about change in TextChange event
FStringList: TStringList; // Holds the lines to show
FHasTrailingLineBreak: Boolean; // Indicates whether lines have trailing line break
FOwner: TWinControl; // Lazarus Control Owning MemoStrings
procedure InternalUpdate;
procedure ExternalUpdate(var AStr: WideString;
@ -138,7 +139,7 @@ begin
if W <> '' then
SetInternalText(UTF16ToUTF8(W))
else
FStringList.Text := '';
SetInternalText('');
FTextChanged := False;
end;
@ -189,18 +190,26 @@ var
begin
Result := FStringList.Text;
// remove trailing line break
TextLen := Length(Result);
if (TextLen > 0) and (Result[TextLen] = #10) then
Dec(TextLen);
if (TextLen > 0) and (Result[TextLen] = #13) then
Dec(TextLen);
SetLength(Result, TextLen);
// Since TStringList.Text automatically adds line break to the last line,
// we should remove it if original text does not contain it
if not FHasTrailingLineBreak then
begin
TextLen := Length(Result);
if (TextLen > 0) and (Result[TextLen] = #10) then
Dec(TextLen);
if (TextLen > 0) and (Result[TextLen] = #13) then
Dec(TextLen);
SetLength(Result, TextLen);
end;
end;
procedure TQtMemoStrings.SetInternalText(const Value: string);
var
TextLen: Integer;
begin
FStringList.Text := Value + LineEnding;
TextLen := Length(Value);
FHasTrailingLineBreak := (TextLen > 0) and (Value[TextLen] in [#13, #10]);
FStringList.Text := Value;
end;
{------------------------------------------------------------------------------
@ -295,6 +304,7 @@ begin
WriteLn('TQtMemoStrings.Create Unspecified owner');
{$endif}
FStringList := TStringList.Create;
FHasTrailingLineBreak := False;
FOwner := TheOwner;
end;