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

Gtk2: fixed drawing images when TListView.OwnerData := true. issue #27469

Browse Source 
git-svn-id: trunk@47805 -
This commit is contained in:
zeljko 2015-02-15 15:01:06 +00:00
parent 9caddb7ee7
commit 87c3c117f1
1 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lcl/interfaces/gtk2/gtk2wscustomlistview.inc
View File

@ -396,6 +396,13 @@ var
ImageIndex: Integer; ImageIndex: Integer;
ColumnIndex: Integer; ColumnIndex: Integer;
APath: PGtkTreePath; APath: PGtkTreePath;
ImageList: TCustomImageList;
Bmp: TBitmap;
GDIObj: PGDIObject;
ABitmap: PGdkBitmap;
pixbuf: PGdkPixbuf;
pixmap: PGdkPixmap;
AWidth, AHeight: gint;
begin begin
PGtkCellRendererPixbuf(cell)^.pixbuf := nil; PGtkCellRendererPixbuf(cell)^.pixbuf := nil;
Widgets := PTVWidgets(WidgetInfo^.UserData); Widgets := PTVWidgets(WidgetInfo^.UserData);
@ -405,9 +412,14 @@ begin
if ListColumn = nil then if ListColumn = nil then
Exit; Exit;
ColumnIndex := ListColumn.Index; ColumnIndex := ListColumn.Index;
ImageList := nil;
Images := Widgets^.Images; Images := Widgets^.Images;
if Images = nil then if TCustomListView(WidgetInfo^.LCLObject).OwnerData then
ImageList := TLVHack(WidgetInfo^.LCLObject).SmallImages;
if (Images = nil) and (ImageList = nil) then
begin
Exit; Exit;
end;
ImageIndex := -1; ImageIndex := -1;
if (ListItem = nil) and TCustomListView(WidgetInfo^.LCLObject).OwnerData then if (ListItem = nil) and TCustomListView(WidgetInfo^.LCLObject).OwnerData then
@ -426,6 +438,41 @@ begin
if ColumnIndex -1 <= ListItem.SubItems.Count-1 then if ColumnIndex -1 <= ListItem.SubItems.Count-1 then
ImageIndex := ListItem.SubItemImages[ColumnIndex-1]; ImageIndex := ListItem.SubItemImages[ColumnIndex-1];
if (ImageList <> nil) and
(ImageIndex > -1) and (ImageIndex <= ImageList.Count-1) then
begin
Bmp := TBitmap.create;
try
pixbuf := nil;
ImageList.GetBitmap(ImageIndex, Bmp);
GDIObj := {%H-}PGDIObject(Bmp.Handle);
case GDIObj^.GDIBitmapType of
gbBitmap:
begin
ABitmap := GDIObj^.GDIBitmapObject;
gdk_drawable_get_size(ABitmap, @AWidth, @AHeight);
pixbuf := CreatePixbufFromDrawable(ABitmap, nil, False, 0, 0, 0, 0, AWidth, AHeight);
end;
gbPixmap:
begin
pixmap := GDIObj^.GDIPixmapObject.Image;
if pixmap <> nil then
begin
gdk_drawable_get_size(pixmap, @AWidth, @AHeight);
ABitmap := CreateGdkMaskBitmap(Bmp.Handle, 0);
pixbuf := CreatePixbufFromImageAndMask(pixmap, 0, 0, AWidth, AHeight, nil, ABitmap);
end;
end;
gbPixbuf:
begin
pixbuf := gdk_pixbuf_copy(GDIObj^.GDIPixbufObject);
end;
end;
PGtkCellRendererPixbuf(cell)^.pixbuf :=pixbuf;
finally
Bmp.Free;
end;
end else
if (ImageIndex > -1) and (ImageIndex <= Images.Count-1) then if (ImageIndex > -1) and (ImageIndex <= Images.Count-1) then
PGtkCellRendererPixbuf(cell)^.pixbuf := PGdkPixbuf(Images.Items[ImageIndex]) PGtkCellRendererPixbuf(cell)^.pixbuf := PGdkPixbuf(Images.Items[ImageIndex])
else else