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

Fixes back TCDPageControl drawing

Browse Source 
git-svn-id: trunk@32722 -
This commit is contained in:
sekelsenmat 2011-10-06 14:26:47 +00:00
parent fd8140b04b
commit 8daf1dbf4a
1 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/customdrawn/customdrawnextras.pas
View File

@ -959,7 +959,7 @@ end;
function TCDControl.GetClientRect: TRect; function TCDControl.GetClientRect: TRect;
begin begin
if FCurrentDrawer = nil then if FCurrentDrawer = nil then
Result := Bounds(0, 0, Width, Height) Result := inherited GetClientRect()
else else
Result := FCurrentDrawer.GetClientRect(Self); Result := FCurrentDrawer.GetClientRect(Self);
end; end;
@ -2596,9 +2596,36 @@ end;
{ TCDPageControl } { TCDPageControl }
procedure TCDPageControl.AddPage(S: string); procedure TCDPageControl.AddPage(S: string);
// InsertPage(FPages.Count, S);
var
NewPage: TCDTabSheet;
begin begin
InsertPage(FPages.Count, S); NewPage := TCDTabSheet.Create(Owner);
end; NewPage.Parent := Self;
//Name := Designer.CreateUniqueComponentName(ClassName);
NewPage.Name := GetUniqueName(sTABSHEET_DEFAULT_NAME, Self.Owner);
if S = '' then
NewPage.Caption := NewPage.Name
else
NewPage.Caption := S;
NewPage.SetBounds(1, 32 + 1, Width - 3, Height - 32 - 4);
NewPage.BorderSpacing.Top := 32 + 2;
NewPage.BorderSpacing.Left := 2;
NewPage.BorderSpacing.Right := 3;
NewPage.BorderSpacing.Bottom := 3;
NewPage.Align := alClient;
if ActivePage <> nil then
ActivePage.Hide;
ActivePage := NewPage;
NewPage.Show;
//FPages.AddObject(NewPage.Name, NewPage);
FPages.Insert(FPages.Count);
FPages.Items[FPages.Count - 1].DisplayName := NewPage.Name;
FPages.Items[FPages.Count - 1].TabPage := NewPage;
NewPage.Index := FPages.Count - 1;
FPageIndex := FPages.Count - 1;
//FPageCount := PageCount + 1;
enD;
procedure TCDPageControl.InsertPage(aIndex: integer; S: string); procedure TCDPageControl.InsertPage(aIndex: integer; S: string);
var var
@ -2613,6 +2640,11 @@ begin
else else
NewPage.Caption := S; NewPage.Caption := S;
NewPage.SetBounds(1, 32 + 1, Width - 3, Height - 32 - 4);
NewPage.BorderSpacing.Top := 32 + 2;
NewPage.BorderSpacing.Left := 2;
NewPage.BorderSpacing.Right := 3;
NewPage.BorderSpacing.Bottom := 3;
NewPage.Align := alClient; NewPage.Align := alClient;
if ActivePage <> nil then if ActivePage <> nil then