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

LCL: Fix grid ellipsis editor layout. Issue #34307

Browse Source 
(cherry picked from commit f8f1652fd4)
This commit is contained in:
Jesus Reyes A 2021-09-04 18:43:42 -05:00
parent d767c1dcee
commit 003e6cd074
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lcl/grids.pas
View File

@ -322,6 +322,8 @@ type
procedure VisibleChanging; override;
function SendChar(AChar: TUTF8Char): Integer;
procedure WndProc(var TheMessage : TLMessage); override;
procedure CustomAlignPosition(AControl: TControl; var ANewLeft, ANewTop, ANewWidth,
ANewHeight: Integer; var AlignRect: TRect; AlignInfo: TAlignInfo); override;
public
destructor Destroy; override;
procedure AddEditor(aEditor: TWinControl; aAlign: TAlign; ActiveCtrl:boolean);
@ -5545,7 +5547,7 @@ end;
function TCustomGrid.GetEditorBorderStyle: TBorderStyle;
begin
result := bsSingle;
if FEditor = FStringEditor then
if (FEditor = FStringEditor) or (FEditor = FButtonStringEditor) then
Result := FStringEditor.BorderStyle
else if FEditor = FPickListEditor then
Result := FPickListEditor.BorderStyle;
@ -8553,8 +8555,18 @@ end;
procedure TCustomGrid.EditorPos;
var
msg: TGridMessage;
CellR: TRect;
CellR, editorBounds: TRect;
PosValid: Boolean;
procedure CalcEditorBounds(aEditor: TWinControl; var refRect: TRect);
begin
if (aEditor = FStringEditor) and (EditorBorderStyle = bsNone) then
refRect := TWSCustomGridClass(WidgetSetClass).
GetEditorBoundsFromCellRect(Canvas, refRect, GetColumnLayout(FCol, False))
else
AdjustInnerCellRect(refRect);
end;
begin
{$ifdef dbgGrid} DebugLn('Grid.EditorPos INIT');{$endif}
if HandleAllocated and (FEditor<>nil) then begin
@ -8585,13 +8597,16 @@ begin
Canvas.Font.Assign(Font);
if FEditorOptions and EO_AUTOSIZE = EO_AUTOSIZE then begin
if (FEditor = FStringEditor) and (EditorBorderStyle = bsNone) then
CellR := TWSCustomGridClass(WidgetSetClass).
GetEditorBoundsFromCellRect(Canvas, CellR, GetColumnLayout(FCol, False))
else
AdjustInnerCellRect(CellR);
CalcEditorBounds(FEditor, CellR);
FEditor.BoundsRect := CellR;
end else begin
if FEditor=FButtonStringEditor then begin
// here we ensure that FStringEditor which is the ActiveControl in
// FButtonStringEditor get its bounds right
editorBounds := CellR;
CalcEditorBounds(FStringEditor, editorBounds);
FStringEditor.BoundsRect := editorBounds;
end;
Msg.LclMsg.msg:=GM_SETBOUNDS;
Msg.CellRect:=CellR;
Msg.Grid:=Self;
@ -9827,7 +9842,7 @@ begin
FButtonStringEditor := TCompositeCellEditor.Create(nil);
FButtonStringEditor.Name:='ButtonTextEditor';
FButtonStringEditor.Visible:=False;
FButtonStringEditor.AddEditor(FStringEditor, alClient, true);
FButtonStringEditor.AddEditor(FStringEditor, alCustom, true);
FButtonStringEditor.AddEditor(FButtonEditor, alRight, false);
FFastEditing := True;
@ -13629,6 +13644,16 @@ begin
inherited WndProc(TheMessage);
end;
procedure TCompositeCellEditor.CustomAlignPosition(AControl: TControl;
var ANewLeft, ANewTop, ANewWidth, ANewHeight: Integer; var AlignRect: TRect;
AlignInfo: TAlignInfo);
begin
// Currently there is only one custom aligned control, so no provision is for
// calling CustomAlignInsertBefore() or share the space with other editors.
aNewLeft := 0;
aNewWidth := AlignRect.Width;
aNewTop := alignRect.Height div 2 - aNewHeight div 2;
end;
function TCompositeCellEditor.DoUTF8KeyPress(var UTF8Key: TUTF8Char): boolean;
begin