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

fixed some things

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@255 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
christian_u
2007-09-02 19:13:23 +00:00
parent 95fb7fb08f
commit 4b3d8c0c5e
1 changed files with 11 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
components/virtualtreeview/virtualtrees.pas
View File

@ -70,7 +70,7 @@ interface
{.$define UseLocalMemoryManager} {.$define UseLocalMemoryManager}
uses uses
LCLProc, LCLType, Types, LMessages, LCLIntf, SysUtils, Classes, vt_opbitmap, vt_lazbridge, Graphics, Controls, Forms, ImgList, {ActiveX,} StdCtrls, Menus, Printers, LCLProc, LCLType, Types, LMessages, LCLIntf, SysUtils, Classes,Graphics, Controls, Forms, ImgList, {ActiveX,} StdCtrls, Menus, Printers,
LResources, GraphType, CustomTimer, LResources, GraphType, CustomTimer,
SyncObjs, // critical sections SyncObjs, // critical sections
CommCtrl // image lists, common controls tree structures CommCtrl // image lists, common controls tree structures
@ -3163,16 +3163,16 @@ procedure DrawTextW(Canvas: TCanvas; lpString: PWideChar; var lpRect: TRect; uFo
var Style:TTextStyle; var Style:TTextStyle;
begin begin
{$ifndef WINCE} {$ifndef WINCE}
<<<<<<< .mine {$ifdef UNIX}
{$ifdef UNIX} {$ifdef LCLgtk}
======= Style.Layout:=tlCenter;
{$ifdef LCLgtk} Canvas.TextRect(lpRect,lpRect.Left,lpRect.Top,lpString,Style); // theo 24.2.2007 Gibt sonst Striche auf GTK1
>>>>>>> .r252 {$else}
Style.Layout:=tlCenter; DrawTextW(Canvas.Handle, lpString, Length(lpString), lpRect, uFormat, AdjustRight);
Canvas.TextRect(lpRect,lpRect.Left,lpRect.Top,lpString,Style); // theo 24.2.2007 Gibt sonst Striche auf GTK1 {$endif}
{$else} {$else}
DrawTextW(Canvas.Handle, lpString, Length(lpString), lpRect, uFormat, AdjustRight); Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
{$endif} {$endif}
{$else} {$else}
Canvas.TextOut(lpRect.Left,lpRect.Top,lpString); Canvas.TextOut(lpRect.Left,lpRect.Top,lpString);
{$endif} {$endif}
@ -3734,7 +3734,6 @@ var
Dest: TRect; Dest: TRect;
//Small (???) hack while a solution does not come //Small (???) hack while a solution does not come
Stream: TMemoryStream; Stream: TMemoryStream;
TempOPB, SourceOPB:TCanvasOPBitmap;
begin begin
Watcher.Enter; Watcher.Enter;
try try
@ -3764,24 +3763,6 @@ begin
MaskColor := clFuchsia;//Images.Canvas.Pixels[0, 0]; // this is usually clFuchsia MaskColor := clFuchsia;//Images.Canvas.Pixels[0, 0]; // this is usually clFuchsia
Dest := Rect(0, 0, IL.Width, IL.Height); Dest := Rect(0, 0, IL.Width, IL.Height);
SourceOPB:=TCanvasOPBitmap.create; //theo 25.2.07
AssignBitmapToOpBitmap(Images,SourceOPB);
for I := 0 to (Images.Width div Images.Height) - 1 do
begin
Source := Rect(I * IL.Width, 0, (I + 1) * IL.Width, IL.Height);
TempOPB:=TCanvasOPBitmap.create;
TempOPB.Width:=IL.Height;
TempOPB.Height:=IL.Width;
TempOPB.Canvas.CopyRect(Dest, SourceOPB.Canvas, Source);
TempOPB.TransparentColor:=MaskColor;
AnotherImage:=TBitmap.Create;
AssignOpBitmapToBitmap(TempOPB,AnotherImage);
TempOPB.free;
IL.AddDirect(AnotherImage, nil);
end;
SourceOPB.free;
{
for I := 0 to (Images.Width div Images.Height) - 1 do for I := 0 to (Images.Width div Images.Height) - 1 do
begin begin
Source := Rect(I * IL.Width, 0, (I + 1) * IL.Width, IL.Height); Source := Rect(I * IL.Width, 0, (I + 1) * IL.Width, IL.Height);
@ -3798,7 +3779,6 @@ begin
Stream.Size:=0; Stream.Size:=0;
IL.Add(AnotherImage, nil); IL.Add(AnotherImage, nil);
end; end;
}
finally finally
Images.Free; Images.Free;
//OneImage.Free; //OneImage.Free;