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

gtk3wscontrols: fix assertion inside SetBounds()

Browse Source 
gtk3wscomctrls: implemented TTabControl

git-svn-id: trunk@55091 -
This commit is contained in:
zeljko 2017-05-26 09:19:17 +00:00
parent 0a06e5079d
commit 4f99ebf0c6
2 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
lcl/interfaces/gtk3/gtk3wscomctrls.pp
View File

@ -1035,7 +1035,10 @@ end;
class function TGtk3WSCustomTabControl.CreateHandle(
const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle;
begin
Result := TLCLIntfHandle(TGtk3NoteBook.Create(AWinControl, AParams));
if AWinControl is TTabControl then
Result := TLCLIntfHandle(TGtk3CustomControl.Create(AWinControl, AParams))
else
Result := TLCLIntfHandle(TGtk3NoteBook.Create(AWinControl, AParams));
end;
(*
@ -1056,8 +1059,16 @@ var
begin
if not WSCheckHandleAllocated(ATabControl, 'AddPage') then
Exit;
// set LCL size
AChild.SetBounds(AChild.Left, AChild.Top, ATabControl.ClientWidth, ATabControl.ClientHeight);
if ATabControl is TTabControl then
begin
if AChild.HandleObjectShouldBeVisible then
TGtk3Widget(AChild.Handle).Show;
exit;
end;
if AChild.TabVisible then
TGtk3Widget(AChild.Handle).Widget^.show;
TGtk3Widget(AChild.Handle).Show;
TGtk3Notebook(ATabControl.Handle).InsertPage(AChild, AIndex);
end;
@ -1067,6 +1078,8 @@ class procedure TGtk3WSCustomTabControl.MovePage(
begin
if not WSCheckHandleAllocated(ATabControl, 'MovePage') then
Exit;
if (ATabControl is TTabControl) then
exit;
TGtk3Notebook(ATabControl.Handle).MovePage(AChild, NewIndex);
end;
@ -1075,6 +1088,8 @@ class procedure TGtk3WSCustomTabControl.RemovePage(
begin
if not WSCheckHandleAllocated(ATabControl, 'RemovePage') then
Exit;
if (ATabControl is TTabControl) then
exit;
TGtk3Notebook(ATabControl.Handle).RemovePage(AIndex);
end;
@ -1086,20 +1101,22 @@ end;
class function TGtk3WSCustomTabControl.GetNotebookMinTabHeight(
const AWinControl: TWinControl): integer;
begin
Result := 0;
Result := inherited GetNotebookMinTabHeight(AWinControl);
// inherited GetNotebookMinTabHeight(AWinControl);
end;
class function TGtk3WSCustomTabControl.GetNotebookMinTabWidth(
const AWinControl: TWinControl): integer;
begin
Result := 0;
// inherited GetNotebookMinTabWidth(AWinControl);
Result := TWSCustomTabControl.GetNotebookMinTabWidth(AWinControl);
end;
class function TGtk3WSCustomTabControl.GetTabIndexAtPos(
const ATabControl: TCustomTabControl; const AClientPos: TPoint): integer;
begin
Result:=-1;
if (ATabControl is TTabControl) then
exit;
Result := 0;
// inherited GetTabIndexAtPos(ATabControl, AClientPos);
end;
@ -1107,6 +1124,10 @@ end;
class function TGtk3WSCustomTabControl.GetTabRect(
const ATabControl: TCustomTabControl; const AIndex: Integer): TRect;
begin
Result := inherited;
if (ATabControl is TTabControl) then
exit;
Result := Rect(0, 0, 0, 0);
// inherited GetTabRect(ATabControl, AIndex);
end;
@ -1114,6 +1135,8 @@ end;
class procedure TGtk3WSCustomTabControl.SetPageIndex(
const ATabControl: TCustomTabControl; const AIndex: integer);
begin
if (ATabControl is TTabControl) then
exit;
if not WSCheckHandleAllocated(ATabControl, 'SetPageIndex') then
Exit;
TGtk3Notebook(ATabControl.Handle).BeginUpdate;
@ -1125,6 +1148,8 @@ class procedure TGtk3WSCustomTabControl.SetTabCaption(
const ATabControl: TCustomTabControl; const AChild: TCustomPage;
const AText: string);
begin
if (ATabControl is TTabControl) then
exit;
if not WSCheckHandleAllocated(ATabControl, 'SetTabCaption') then
Exit;
TGtk3NoteBook(ATabControl.Handle).SetTabLabelText(AChild, AText);
@ -1133,6 +1158,8 @@ end;
class procedure TGtk3WSCustomTabControl.SetTabPosition(
const ATabControl: TCustomTabControl; const ATabPosition: TTabPosition);
begin
if (ATabControl is TTabControl) then
exit;
if not WSCheckHandleAllocated(ATabControl, 'SetTabPosition') then
Exit;
TGtk3NoteBook(ATabControl.Handle).SetTabPosition(ATabPosition);
@ -1141,6 +1168,8 @@ end;
class procedure TGtk3WSCustomTabControl.ShowTabs(
const ATabControl: TCustomTabControl; AShowTabs: boolean);
begin
if ATabControl is TTabControl then
exit;
if not WSCheckHandleAllocated(ATabControl, 'ShowTabs') then
Exit;
TGtk3NoteBook(ATabControl.Handle).SetShowTabs(AShowTabs);
@ -1149,6 +1178,8 @@ end;
class procedure TGtk3WSCustomTabControl.UpdateProperties(
const ATabControl: TCustomTabControl);
begin
if ATabControl is TTabControl then
exit;
// inherited UpdateProperties(ATabControl);
if not WSCheckHandleAllocated(ATabControl, 'ATabControl') then
Exit;

5
lcl/interfaces/gtk3/gtk3wscontrols.pp
View File

@ -334,6 +334,7 @@ var
AWidget: PGtkWidget;
ARect: TGdkRectangle;
Alloc: TGtkAllocation;
AMinSize, ANaturalSize: gint;
begin
if not WSCheckHandleAllocated(AWinControl, 'SetBounds') then
Exit;
@ -354,6 +355,10 @@ begin
end;
TGtk3Widget(AWinControl.Handle).BeginUpdate;
try
{fixes gtk3 assertion}
AWidget^.get_preferred_width(@AMinSize, @ANaturalSize);
AWidget^.get_preferred_height(@AMinSize, @ANaturalSize);
AWidget^.size_allocate(@ARect);
AWidget^.set_size_request(AWidth, AHeight);
if AWinControl.Parent <> nil then