paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-01 15:29:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed trailing lines when setting text of TMemo.Patch from Vladimir Zhirov with my changes to TQtMemoStrings.Assign.Fixes issue #18067

Browse Source 
git-svn-id: trunk@28516 -
This commit is contained in:
zeljko 2010-11-28 08:55:16 +00:00
parent 3f492dc212
commit 0206d775d7
1 changed files with 30 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,8 @@ type
procedure InternalUpdate;
procedure ExternalUpdate(var AStr: WideString;
AClear, ABlockSignals: Boolean);
function GetInternalText: string;
procedure SetInternalText(const Value: string);
protected
function GetTextStr: string; override;
function GetCount: integer; override;
@ -106,7 +108,6 @@ type
procedure Clear; override;
procedure Delete(Index : integer); override;
procedure Insert(Index : integer; const S: string); override;
procedure SetText(TheText: PChar); override;
public
property Owner: TWinControl read FOwner;
property TextChanged: Boolean read FTextChanged write FTextChanged;
@ -135,7 +136,7 @@ begin
W := TextEdit.getText;
end;
if W <> '' then
FStringList.Text := UTF16ToUTF8(W) + LineEnding
SetInternalText(UTF16ToUTF8(W))
else
FStringList.Text := '';
FTextChanged := False;
@ -183,21 +184,10 @@ begin
TextEdit.EndUpdate;
end;
{------------------------------------------------------------------------------
Method: TQtMemoStrings.GetTextStr
Params: None
Returns: a string
Return the whole StringList content as a single string
------------------------------------------------------------------------------}
function TQtMemoStrings.GetTextStr: string;
function TQtMemoStrings.GetInternalText: string;
var
TextLen: Integer;
begin
{$ifdef VerboseQtMemoStrings}
WriteLn('TQtMemoStrings.GetTextStr');
{$endif}
if FTextChanged then InternalUpdate;
Result := FStringList.Text;
// remove trailing line break
@ -209,6 +199,27 @@ begin
SetLength(Result, TextLen);
end;
procedure TQtMemoStrings.SetInternalText(const Value: string);
begin
FStringList.Text := Value + LineEnding;
end;
{------------------------------------------------------------------------------
Method: TQtMemoStrings.GetTextStr
Params: None
Returns: a string
Return the whole StringList content as a single string
------------------------------------------------------------------------------}
function TQtMemoStrings.GetTextStr: string;
begin
{$ifdef VerboseQtMemoStrings}
WriteLn('TQtMemoStrings.GetTextStr');
{$endif}
if FTextChanged then InternalUpdate;
Result := GetInternalText;
end;
{------------------------------------------------------------------------------
Method: TQtMemoStrings.GetCount
Params: None
@ -266,10 +277,10 @@ begin
{$ifdef VerboseQtMemoStrings}
WriteLn('TQtMemoStrings.SetTextStr Value=',Value);
{$endif}
inherited SetTextStr(Value);
FStringList.Text := Value;
W := FStringList.Text;
SetInternalText(Value);
W := GetInternalText;
ExternalUpdate(W, True, False);
FTextChanged := False;
end;
{------------------------------------------------------------------------------
@ -326,8 +337,8 @@ begin
writeln('TQtMemoStrings.Assign - handle ? ', FOwner.HandleAllocated);
{$endif}
FStringList.Clear;
FStringList.Text := TStrings(Source).Text;
W := FStringList.Text;
SetInternalText(TStrings(Source).Text);
W := GetInternalText;
ExternalUpdate(W, True, False);
FTextChanged := False;
exit;
@ -428,28 +439,6 @@ begin
end;
end;
{------------------------------------------------------------------------------
Method: TQtMemoStrings.SetText
Params: A null terminated string
Returns: Nothing
Fills the memo with the string
------------------------------------------------------------------------------}
procedure TQtMemoStrings.SetText(TheText: PChar);
Var
S: String;
W: WideString;
begin
{$ifdef VerboseQtMemoStrings}
writeln('TQtMemoStrings.SetText');
{$endif}
S := StrPas(TheText);
FStringList.Text := S;
W := S;
ExternalUpdate(W, True, False);
FTextChanged := False;
end;
{ TQtComboStrings }
procedure TQtComboStrings.Put(Index: Integer; const S: string);