Do not break column names with spaces with WordWrap(). Fixes issue #2390.

This commit is contained in:
Ansgar Becker
2011-04-22 08:01:53 +00:00
parent 40290e4ef8
commit b9b981ab39

View File

@ -7162,21 +7162,25 @@ end;
procedure TMainForm.editFilterSearchChange(Sender: TObject); procedure TMainForm.editFilterSearchChange(Sender: TObject);
var var
Clause: String; Clause, Line: String;
i: Integer; i: Integer;
ed: TEdit; ed: TEdit;
begin begin
ed := TEdit(Sender); ed := TEdit(Sender);
Clause := ''; Clause := '';
if ed.Text <> '' then begin if ed.Text <> '' then begin
Line := '';
for i:=0 to SelectedTableColumns.Count-1 do begin for i:=0 to SelectedTableColumns.Count-1 do begin
if i > 0 then if i > 0 then
Clause := Clause + ' OR '; Line := Line + ' OR ';
Clause := Clause + ActiveConnection.QuoteIdent(SelectedTableColumns[i].Name) + ' LIKE ' + esc('%'+ed.Text+'%'); Line := Line + ActiveConnection.QuoteIdent(SelectedTableColumns[i].Name) + ' LIKE ' + esc('%'+ed.Text+'%');
// Add linebreak near right window edge
if Length(Line) > SynMemoFilter.CharsInWindow-30 then begin
Clause := Clause + Line + CRLF;
Line := '';
end;
end; end;
end; end;
// Add linebreaks at near right window edge
Clause := WrapText(Clause, SynMemoFilter.CharsInWindow-5);
SynMemoFilter.UndoList.AddGroupBreak; SynMemoFilter.UndoList.AddGroupBreak;
SynMemoFilter.SelectAll; SynMemoFilter.SelectAll;
SynMemoFilter.SelText := Clause; SynMemoFilter.SelText := Clause;