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

Gtk3: implemented image (custompage.imageindex) in tabs for TCustomTabControl

Browse Source
This commit is contained in:
zeljan1 2025-03-30 19:03:28 +02:00
parent cec0a1fdbb
commit 82df55c246
2 changed files with 73 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lcl/interfaces/gtk3/gtk3widgets.pas
View File

@ -416,6 +416,7 @@ type
TGtk3Page = class(TGtk3Container)
private
FPageBox: PGtkBox;
FImageWidget: PGtkImage;
FPageLabel: PGtkLabel;
FCloseButton: PGtkButton;
strict private
@ -432,6 +433,7 @@ type
function ClientToScreen(var P:TPoint):boolean; override;
function getClientOffset:TPoint; override;
function getClientRect: TRect; override;
procedure setTabImage(aBitmap: TBitmap);
property CloseButtonVisible: boolean read GetCloseButtonVisible write SetCloseButtonVisible;
end;
@ -5042,6 +5044,9 @@ var
begin
FWidgetType := FWidgetType + [wtLayout];
FPageBox := TGtkBox.new(GTK_ORIENTATION_HORIZONTAL, 4);
FImageWidget := TGtkImage.new;
FPageLabel:= TGtkLabel.new(PChar(Params.Caption));
FPageLabel^.set_use_underline(true);
image := gtk_image_new_from_icon_name('window-close', GTK_ICON_SIZE_MENU);
@ -5050,10 +5055,13 @@ begin
gtk_container_add(PGtkContainer(FCloseButton), image);
gtk_widget_set_name(FCloseButton, 'tab-close-button'); // optional styling via css.
FPageBox^.pack_start(FImageWidget, False, False, 0);
FPageBox^.pack_start(FPageLabel, False, False, 0);
FPageBox^.pack_start(FCloseButton, False, False, 0);
FPageBox^.show_all;
FImageWidget^.hide;
Self.FHasPaint:=true;
// ref it to save it in case TabVisible is set to false
FPageBox^.ref;
@ -5129,6 +5137,26 @@ begin
// DebugLn('TGtk3Page.GetClientRect Result=',dbgs(Result),' Realized ',dbgs(getContainerWidget^.get_realized));
end;
procedure TGtk3Page.setTabImage(aBitmap: TBitmap);
var
APixBuf: PGdkPixbuf;
begin
if Assigned(aBitmap) then
APixBuf := TGtk3Image(aBitmap.Handle).Handle^.copy
else
aPixBuf := nil;
if aPixBuf = nil then
begin
FImageWidget^.set_from_pixbuf(nil);
FImageWidget^.set_visible(False);
end else
begin
FImageWidget^.set_from_pixbuf(aPixBuf);
FImageWidget^.set_visible(True);
aPixbuf^.unref;
end;
end;
{ TGtk3NoteBook }
function NotebookPageRealToLCLIndex(const ATabControl: TCustomTabControl; AIndex: integer): integer;
@ -5371,11 +5399,21 @@ procedure TGtk3NoteBook.InsertPage(ACustomPage: TCustomPage; AIndex: Integer);
var
Gtk3Page: TGtk3Page;
AMinSize, ANaturalSize: gint;
Bmp: TBitmap;
begin
if IsWidgetOK then
begin
Gtk3Page := TGtk3Page(ACustomPage.Handle);
Gtk3Page.CloseButtonVisible := nboShowCloseButtons in TCustomTabControl(LCLObject).Options;
if Assigned(TCustomTabControl(LCLObject).Images) and (ACustomPage.ImageIndex >= 0) and
(ACustomPage.ImageIndex < TCustomTabControl(LCLObject).Images.Count) then
begin
Bmp := TBitmap.Create;
TCustomTabControl(LCLObject).Images.GetBitmap(ACustomPage.ImageIndex, Bmp);
Gtk3Page.setTabImage(Bmp);
Bmp.Free;
end else
Gtk3Page.setTabImage(nil);
with PGtkNoteBook(GetContainerWidget)^ do
insert_page(Gtk3Page.Widget, Gtk3Page.FPageBox, AIndex);
end;

40
lcl/interfaces/gtk3/gtk3wscomctrls.pp
View File

@ -1595,15 +1595,16 @@ var
begin
if ATabControl is TTabControl then
exit;
// inherited UpdateProperties(ATabControl);
if not WSCheckHandleAllocated(ATabControl, 'ATabControl') then
Exit;
for i := 0 to PGtkNotebook(TGtk3NoteBook(ATabControl.Handle).GetContainerWidget)^.get_n_pages - 1 do
begin
aPage := PGtkNotebook(TGtk3NoteBook(ATabControl.Handle).GetContainerWidget)^.get_nth_page(i);
aLCLPage := TGtk3Page(HwndFromGtkWidget(aPage));
if Assigned(aLCLPage) then
begin
aLCLPage.CloseButtonVisible := (nboShowCloseButtons in ATabControl.Options);
if Assigned(ATabControl.Images) then
TGtk3WSCustomPage.UpdateProperties(TCustomPage(aLCLPage.LCLObject));
end;
end;
if (nboHidePageListPopup in ATabControl.Options) then
PGtkNotebook(TGtk3NoteBook(ATabControl.Handle).GetContainerWidget)^.popup_disable
@ -1664,9 +1665,38 @@ end;
class procedure TGtk3WSCustomPage.UpdateProperties(
const ACustomPage: TCustomPage);
var
ImageList: TCustomImageList;
ImageIndex: Integer;
Bmp: TBitmap;
Res: TScaledImageListResolution;
begin
// inherited UpdateProperties(ACustomPage);
DebugLn('TGtk3WSCustomPage.UpdateProperties missing implementation ');
if not WSCheckHandleAllocated(ACustomPage, 'UpdateProperties') then
Exit;
ImageList := TCustomTabControl(ACustomPage.Parent).Images;
if Assigned(ImageList) then
begin
Res := ImageList.ResolutionForPPI[
TCustomTabControl(ACustomPage.Parent).ImagesWidth,
TCustomTabControl(ACustomPage.Parent).Font.PixelsPerInch,
TCustomTabControl(ACustomPage.Parent).GetCanvasScaleFactor];
ImageIndex := TCustomTabControl(ACustomPage.Parent).GetImageIndex(ACustomPage.PageIndex);
if (ImageIndex >= 0) and (ImageIndex < Res.Count) then
begin
Bmp := TBitmap.Create;
try
Res.GetBitmap(ACustomPage.ImageIndex, Bmp);
TGtk3Page(ACustomPage.Handle).setTabImage(Bmp);
finally
Bmp.Free;
end;
end else
TGtk3Page(ACustomPage.Handle).setTabImage(nil);
end else
TGtk3Page(ACustomPage.Handle).setTabImage(nil);
end;
end.