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

gtk2: fix 2 typos in comments

Browse Source 
git-svn-id: trunk@12763 -
This commit is contained in:
paul 2007-11-07 01:56:03 +00:00
parent f5f14337fe
commit 157e720653
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
ideintf/imagelisteditor.pp
View File

@ -1,4 +1,4 @@
{ {
***************************************************************************** *****************************************************************************
* * * *
* See the file COPYING.modifiedLGPL, included in this distribution, * * See the file COPYING.modifiedLGPL, included in this distribution, *
@ -135,27 +135,18 @@ function CreateGlyph(B: TBitmap; Width, Height: Integer;
Adjustment: TGlyphAdjustment; TransparentColor: TColor = clFuchsia): TBitmap; Adjustment: TGlyphAdjustment; TransparentColor: TColor = clFuchsia): TBitmap;
begin begin
Result := TBitmap.Create; Result := TBitmap.Create;
if (Adjustment = gaNone) then Result.Width := Width;
begin Result.Height := Height;
Result.Assign(B); Result.Canvas.Brush.Color := TransparentColor;
end Result.Canvas.FillRect(Bounds(0, 0, Width, Height));
else case Adjustment of
begin
Result.Width := Width;
Result.Height := Height;
Result.Canvas.Brush.Color := TransparentColor;
Result.Canvas.FillRect(Bounds(0, 0, Width, Height));
case Adjustment of
gaStretch: Result.Canvas.StretchDraw(Bounds(0, 0, Width, Height), B); gaStretch: Result.Canvas.StretchDraw(Bounds(0, 0, Width, Height), B);
gaCrop: Result.Canvas.Draw(0, 0, B); gaCrop, gaNone: Result.Canvas.Draw(0, 0, B);
gaCenter: Result.Canvas.Draw((Width - B.Width) div 2, (Height - B.Height) div 2, B); gaCenter: Result.Canvas.Draw((Width - B.Width) div 2, (Height - B.Height) div 2, B);
end;
Result.TransparentColor := TransparentColor;
Result.Transparent := True;
Result.TransparentMode := tmAuto;
end; end;
Result.TransparentColor := TransparentColor;
Result.Transparent:= True;
Result.TransparentMode := tmAuto;
end; end;
function CreateGlyphSplit(Src: TBitmap; Width, Height: Integer; SrcSplitIndex: Integer): TBitmap; function CreateGlyphSplit(Src: TBitmap; Width, Height: Integer; SrcSplitIndex: Integer): TBitmap;
@ -163,8 +154,13 @@ begin
Result := TBitmap.Create; Result := TBitmap.Create;
Result.Width := Width; Result.Width := Width;
Result.Height := Height; Result.Height := Height;
Result.Canvas.Brush.Color:= Src.TransparentColor;
Result.Canvas.FillRect(Bounds(0, 0, Width, Height));
Result.Canvas.CopyRect( Rect(0, 0, Width, Height), Result.Canvas.CopyRect( Rect(0, 0, Width, Height),
Src.Canvas, Bounds(SrcSplitIndex * Width, 0, Width, Height) ); Src.Canvas, Bounds(SrcSplitIndex * Width, 0, Width, Height) );
Result.TransparentColor := Src.TransparentColor;
Result.Transparent := True;
Result.TransparentMode := tmAuto;
end; end;
{ TImageListEditorDlg } { TImageListEditorDlg }
@ -484,6 +480,8 @@ var
v_PartCount: Integer; v_PartCount: Integer;
c_Part: Integer; c_Part: Integer;
v_CompositeBmp: TBitmap; v_CompositeBmp: TBitmap;
glyphTransparentColor:TColor;
glyphTransparentColorName:String;
begin begin
SaveDialog.InitialDir := ExtractFileDir(FileName); SaveDialog.InitialDir := ExtractFileDir(FileName);
Bmp := nil; Bmp := nil;
@ -491,7 +489,6 @@ begin
Picture := TPicture.Create; Picture := TPicture.Create;
try try
Picture.LoadFromFile(FileName); Picture.LoadFromFile(FileName);
Bmp := TBitmap.Create; Bmp := TBitmap.Create;
Bmp.Assign(Picture.Bitmap); Bmp.Assign(Picture.Bitmap);
finally finally
@ -502,6 +499,12 @@ begin
begin begin
if not Bmp.Empty then if not Bmp.Empty then
begin begin
glyphTransparentColor:= Bmp.Canvas.Pixels[0,Bmp.Height-1];
glyphTransparentColorName:= ColorToString(glyphTransparentColor);
If ColorBoxTransparent.Items.IndexOf(glyphTransparentColorName)<0 then
ColorBoxTransparent.Items.Add(glyphTransparentColorName);
ColorBoxTransparent.Selected := glyphTransparentColor;
Bmp.TransparentColor:= glyphTransparentColor;
if (Bmp.Height = ImageList.Height) if (Bmp.Height = ImageList.Height)
and (Bmp.Width > ImageList.Width) and (Bmp.Width > ImageList.Width)
and (Bmp.Width mod ImageList.Width = 0) and (Bmp.Width mod ImageList.Width = 0)
@ -523,14 +526,14 @@ begin
if Assigned(v_CompositeBmp) then if Assigned(v_CompositeBmp) then
Bmp := CreateGlyphSplit(v_CompositeBmp, ImageList.Width, ImageList.Height, c_Part); Bmp := CreateGlyphSplit(v_CompositeBmp, ImageList.Width, ImageList.Height, c_Part);
Glyph := CreateGlyph(Bmp, ImageList.Width, ImageList.Height, gaNone); Glyph := CreateGlyph(Bmp, ImageList.Width, ImageList.Height, gaNone, Bmp.TransparentColor);
I := ImageList.Add(Glyph, nil); I := ImageList.Add(Glyph, nil);
Glyph.Free; Glyph.Free;
New(P); New(P);
P^.Bitmap := Bmp; P^.Bitmap := Bmp;
P^.Adjustment := gaNone; P^.Adjustment := gaNone;
P^.TransparentColor := clFuchsia; P^.TransparentColor := glyphTransparentColor;
Node := TreeView.Items.AddObject(nil, IntToStr(I), P); Node := TreeView.Items.AddObject(nil, IntToStr(I), P);
Node.ImageIndex := I; Node.ImageIndex := I;