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

Merged revision(s) 56235 #8de5a73097, 56242 #efb8df15a1 from trunk:

Browse Source 
LCL: Prevent a crash when getting editor for an empty Grid. Issue #32623, patch from C Western.
........
LCL: Make procedure RunDialog public in TFileNameEdit, TDirectoryEdit and CalcEdit. Helps with shortcut keys.
........

git-svn-id: branches/fixes_1_8@56246 -
This commit is contained in:
maxim 2017-10-30 21:40:46 +00:00
parent 0d9d5836a6
commit 989c5ebe8c
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/editbtn.pas
View File

@ -349,12 +349,12 @@ type
function CreateDialog(AKind: TDialogKind): TCommonDialog; virtual;
procedure SaveDialogResult(AKind: TDialogKind; D: TCommonDialog); virtual;
procedure ButtonClick; override;
procedure RunDialog; virtual;
procedure EditChange; override;
procedure DoFolderChange(Sender:TObject); virtual;
public
constructor Create(AOwner: TComponent); override;
destructor Destroy; override;
procedure RunDialog; virtual;
property AutoSelected;
property DialogFiles: TStrings read FDialogFiles;
published
@ -454,10 +454,10 @@ type
function CreateDialog: TCommonDialog; virtual;
function GetDialogResult(D : TCommonDialog) : String; virtual;
procedure ButtonClick; override;
procedure RunDialog; virtual;
public
property AutoSelected;
constructor Create(AOwner: TComponent); override;
procedure RunDialog; virtual;
published
// TDirectory properties.
property Directory: String read GetDirectory write SetDirectory;
@ -771,9 +771,9 @@ type
function GetDefaultGlyph: TBitmap; override;
function GetDefaultGlyphName: String; override;
procedure ButtonClick; override;
procedure RunDialog; virtual;
public
constructor Create(AOwner: TComponent); override;
procedure RunDialog; virtual;
property AutoSelected;
published
// CalcEdit properties
@ -1480,7 +1480,6 @@ begin
Result:=TSelectDirectoryDialog(D).FileName;
end;
procedure TDirectoryEdit.ButtonClick;
begin
inherited ButtonClick;

22
lcl/grids.pas
View File

@ -1254,6 +1254,7 @@ type
procedure AutoAdjustColumns; virtual;
procedure BeginUpdate;
function CellRect(ACol, ARow: Integer): TRect;
function CellRectValid(ACol, ARow: Integer; out ARect: TRect): Boolean;
function CellToGridZone(aCol,aRow: Integer): TGridZone;
procedure CheckPosition;
procedure Clear;
@ -3393,12 +3394,18 @@ begin
end;
end;
{ Returns a reactagle corresponding to a fisical cell[aCol,aRow] }
{ Returns a reactagle corresponding to a physical cell[aCol,aRow] }
function TCustomGrid.CellRect(ACol, ARow: Integer): TRect;
begin
//Result:=ColRowToClientCellRect(aCol,aRow);
ColRowToOffset(True, True, ACol, Result.Left, Result.Right);
ColRowToOffSet(False,True, ARow, Result.Top, Result.Bottom);
Assert( (ACol<ColCount) and (ARow<RowCount),
Format('TCustomGrid.CellRect: ACol (%d) or ARow (%d) out of range.',[ACol,ARow]) );
CellRectValid(ACol, ARow, Result);
end;
function TCustomGrid.CellRectValid(ACol, ARow: Integer; out ARect: TRect): Boolean;
begin
Result := ColRowToOffset(True, True, ACol, ARect.Left, ARect.Right)
and ColRowToOffSet(False,True, ARow, ARect.Top, ARect.Bottom);
end;
// The visible grid Depends on TopLeft and ClientWidht,ClientHeight,
@ -8136,6 +8143,7 @@ procedure TCustomGrid.EditorPos;
var
msg: TGridMessage;
CellR: TRect;
PosValid: Boolean;
begin
{$ifdef dbgGrid} DebugLn('Grid.EditorPos INIT');{$endif}
if HandleAllocated and (FEditor<>nil) then begin
@ -8148,9 +8156,11 @@ begin
FEditor.Dispatch(Msg);
// send editor bounds
CellR:=CellRect(FCol,FRow);
PosValid := CellRectValid(FCol, FRow, CellR);
if not PosValid then // Can't position editor; ensure sane values
CellR := Rect(0,0,FEditor.Width, FEditor.Height);
if (CellR.Top<FGCache.FixedHeight) or (CellR.Top>FGCache.ClientHeight) or
if not PosValid or (CellR.Top<FGCache.FixedHeight) or (CellR.Top>FGCache.ClientHeight) or
(UseRightToLeftAlignment and ((CellR.Right-1>FlipX(FGCache.FixedWidth)) or (CellR.Right<0))) or
(not UseRightToLeftAlignment and ((CellR.Left<FGCache.FixedWidth) or (CellR.Left>FGCache.ClientWidth)))
then