pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

gradcontrols: little beautiful fixes under Darwin (full paint width)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1359 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
eugene1
2010-10-31 22:09:32 +00:00
parent bdd91129ee
commit 3aad4e18fa
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
components/gradcontrols/src/ugradbtn.pas
View File

@ -424,9 +424,9 @@ begin
if (bsTopLine in BorderSides) then if (bsTopLine in BorderSides) then
begin begin
Canvas.Pen.Color:=clBlack; Canvas.Pen.Color:=clBlack;
Canvas.Line(FBackgroundRect.Left,0,FBackgroundRect.Right,0); Canvas.Line(FBackgroundRect.Left,0,FBackgroundRect.Right+{$IFDEF DARWIN}1{$ELSE}0{$ENDIF},0);
Canvas.Pen.Color:=clWhite; Canvas.Pen.Color:=clWhite;
Canvas.Line(FBackgroundRect.Left,1,FBackgroundRect.Right,1); Canvas.Line(FBackgroundRect.Left,1,FBackgroundRect.Right+{$IFDEF DARWIN}1{$ELSE}0{$ENDIF},1);
end; end;
//Left //Left
@ -451,9 +451,9 @@ begin
if (bsBottomLine in BorderSides) then if (bsBottomLine in BorderSides) then
begin begin
Canvas.Pen.Color:=clBlack; Canvas.Pen.Color:=clBlack;
Canvas.Line(FBackgroundRect.Left,Height-1,FBackgroundRect.Right,Height-1); Canvas.Line(FBackgroundRect.Left,Height-1,FBackgroundRect.Right+{$IFDEF DARWIN}1{$ELSE}0{$ENDIF},Height-1);
Canvas.Pen.Color:=clWhite; Canvas.Pen.Color:=clWhite;
Canvas.Line(FBackgroundRect.Left,Height-2,FBackgroundRect.Right,Height-2); Canvas.Line(FBackgroundRect.Left,Height-2,FBackgroundRect.Right+{$IFDEF DARWIN}1{$ELSE}0{$ENDIF},Height-2);
end; end;
//TopLeft //TopLeft
@ -753,7 +753,7 @@ begin
end else begin end else begin
TrgCanvas.Pen.Color := ColorsBetween([t1,t2], 1.0-(r / pr.Bottom)); TrgCanvas.Pen.Color := ColorsBetween([t1,t2], 1.0-(r / pr.Bottom));
end; end;
TrgCanvas.Line(pr.Left,r,pr.Right,r); TrgCanvas.Line(pr.Left,r,pr.Right{$IFDEF DARWIN}+1{$ENDIF},r);
end; end;
end else end else
for r := (pr.Bottom)-1 downto pr.Top do for r := (pr.Bottom)-1 downto pr.Top do
@ -765,12 +765,12 @@ begin
end else begin end else begin
TrgCanvas.Pen.Color := ColorsBetween([t1,t2], r / pr.Bottom); TrgCanvas.Pen.Color := ColorsBetween([t1,t2], r / pr.Bottom);
end; end;
TrgCanvas.Line(pr.Left,r,pr.Right,r); TrgCanvas.Line(pr.Left,r,pr.Right{$IFDEF DARWIN}+1{$ENDIF},r);
end; end;
end else begin end else begin
if FState = bsDown then if FState = bsDown then
begin begin
for r := (pr.Right)-1 downto pr.Left do for r := (pr.Right)-{$IFDEF DARWIN}0{$ELSE}1{$ENDIF} downto pr.Left do
begin begin
if (r >= (pr.Right/2)) then if (r >= (pr.Right/2)) then
begin begin
@ -781,7 +781,7 @@ begin
TrgCanvas.Line(r,pr.Top,r,pr.Bottom); TrgCanvas.Line(r,pr.Top,r,pr.Bottom);
end; end;
end else end else
for r := (pr.Right)-1 downto pr.Left do for r := (pr.Right)-{$IFDEF DARWIN}0{$ELSE}1{$ENDIF} downto pr.Left do
begin begin
if (r <= (pr.Right/2)) then if (r <= (pr.Right/2)) then
begin begin

5
components/gradcontrols/src/ugradtabcontrol.pas
View File

@ -1381,7 +1381,6 @@ begin
FNeedOrderButtons := false; FNeedOrderButtons := false;
Logger.EnterMethod(Self, 'OrderButtons'); Logger.EnterMethod(Self, 'OrderButtons');
Logger.
FMovedTo:=0; FMovedTo:=0;
@ -2952,7 +2951,9 @@ begin
if (pfAdded in APage.FFlags) then exit; if (pfAdded in APage.FFlags) then exit;
Include(APage.FFlags,pfAdding); Include(APage.FFlags,pfAdding);
APage.FFlags:=APage.FFlags+[pfAdded]-[pfAdding]; APage.FFlags:=APage.FFlags+[pfAdded]-[pfAdding];
APage.ResizeDelayedAutoSizeChildren {$IFNDEF DARWIN}
APage.ResizeDelayedAutoSizeChildren;
{$ENDIF}
end else begin end else begin
{$IFDEF NOTEBOOK_DEBUG} {$IFDEF NOTEBOOK_DEBUG}
DebugLn(['TGradTabControl.AddRemovePageHandle REMOVE ',DbgSName(APage),' pfAdded=',pfAdded in APage.FFlags]); DebugLn(['TGradTabControl.AddRemovePageHandle REMOVE ',DbgSName(APage),' pfAdded=',pfAdded in APage.FFlags]);