paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 14:38:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gtk3: fixed TGtk3ListView.setColor, implemented ItemGetPosition, recreate handle when ViewStyle of list is changed.

Browse Source
This commit is contained in:
zeljan1 2025-02-05 10:01:09 +01:00
parent 8839d5656a
commit 26a8fe1765
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -622,6 +622,7 @@ type
protected
function CreateWidget(const {%H-}Params: TCreateParams):PGtkWidget; override;
function EatArrowKeys(const {%H-}AKey: Word): Boolean; override;
procedure SetColor(AValue: TColor); override;
class function selection_changed(ctl:TGtk3ListView):gboolean;cdecl;
public
destructor Destroy; override;
@ -646,6 +647,7 @@ type
procedure ItemDelete(AIndex: Integer);
function ItemDisplayRect(AIndex: Integer; ASubItem: integer; ACode: TDisplayCode): TRect;
procedure ItemInsert(AIndex: Integer; AItem: TListItem);
function ItemPosition(AIndex: integer): TPoint;
procedure ItemSetText(AIndex, ASubIndex: Integer; AItem: TListItem; const AText: String);
procedure ItemSetImage(AIndex, ASubIndex: Integer; AItem: TListItem);
procedure ItemSetState(const AIndex: Integer; const {%H-}AItem: TListItem; const AState: TListItemState;
@ -6923,6 +6925,21 @@ begin
Result := False;
end;
procedure TGtk3ListView.SetColor(AValue: TColor);
var
ADisabledColor, BgColor: TGdkRGBA;
begin
BgColor := TColortoTGdkRGBA(ColorToRgb(AValue));
getContainerWidget^.get_style_context^.get_background_color([GTK_STATE_FLAG_INSENSITIVE], @ADisabledColor);
//override all
gtk_widget_override_background_color(getContainerWidget, GTK_STATE_FLAG_NORMAL, @BgColor);
//return system highlight color
BgColor := TColortoTGdkRGBA(ColorToRgb(clHighlight));
gtk_widget_override_background_color(getContainerWidget, [GTK_STATE_FLAG_SELECTED], @BgColor);
gtk_widget_override_background_color(getContainerWidget, [GTK_STATE_FLAG_INSENSITIVE], @ADisabledColor);
end;
destructor TGtk3ListView.Destroy;
begin
ClearImages;
@ -7287,6 +7304,11 @@ begin
begin
Column := gtk_tree_view_get_column(PGtkTreeView(GetContainerWidget), ASubItem);
gtk_tree_view_get_cell_area(PGtkTreeView(GetContainerWidget), Path, Column, @ItemRect);
gtk_tree_view_convert_bin_window_to_widget_coords(
PGtkTreeView(GetContainerWidget),
ItemRect.x, ItemRect.y, @x, @y);
ItemRect.x := x;
ItemRect.y := y;
end else
gtk_icon_view_get_cell_rect(PGtkIconView(getContainerWidget), Path, nil, @ItemRect);
Result := RectFromGdkRect(ItemRect);
@ -7302,6 +7324,7 @@ var
NewIndex: Integer;
bmp:TBitmap;
pxb:PGdkPixbuf;
w,h: gint;
begin
if not IsWidgetOK then
exit;
@ -7321,15 +7344,27 @@ begin
else
begin
bmp:=TBitmap.Create;
TListView(LCLObject).LargeImages.GetBitmap(AIndex,bmp);
if Assigned(TListView(LCLObject).LargeImages) then
TListView(LCLObject).LargeImages.GetBitmap(AIndex,bmp)
else
begin
gtk_icon_size_lookup(Ord(GTK_ICON_SIZE_LARGE_TOOLBAR), @w, @h);
bmp.SetSize(w, h);
end;
pxb:=TGtk3Image(bmp.Handle).Handle;
gtk_list_store_insert_with_values(PGtkListStore(AModel), @Iter, NewIndex,
[0, Pointer(AItem),
1, PChar(AItem.Caption),
2, pxb, -1] );
if not Assigned(FImages) then
FImages := TFPList.Create;
fImages.Add(bmp);
end;
end;
function TGtk3ListView.ItemPosition(AIndex: integer): TPoint;
begin
Result := ItemDisplayRect(AIndex, 0, drBounds).TopLeft;
end;
procedure TGtk3ListView.UpdateItem(AIndex:integer;AItem: TListItem);
@ -7340,6 +7375,7 @@ var
Iter: TGtkTreeIter;
bmp:TBitmap;
pxb:PGdkPixbuf;
w,h: gint;
begin
if IsTreeView then
begin
@ -7353,14 +7389,19 @@ begin
AModel^.get_iter(@iter,path);
bmp:=TBitmap.Create;
TListView(LCLObject).LargeImages.GetBitmap(AItem.ImageIndex,bmp);
if Assigned(TListView(LCLObject).LargeImages) then
TListView(LCLObject).LargeImages.GetBitmap(AItem.ImageIndex,bmp)
else
begin
gtk_icon_size_lookup(Ord(GTK_ICON_SIZE_LARGE_TOOLBAR), @w, @h);
bmp.SetSize(w, h);
end;
pxb:=TGtk3Image(bmp.Handle).Handle;
gtk_list_store_set(PGtkListStore(AModel), @Iter,
[0, Pointer(AItem),
1, PChar(AItem.Caption),
2, pxb, -1] );
fImages.Add(bmp);
gtk_tree_path_free(Path);
end;
end;

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

@ -737,8 +737,10 @@ end;
class function TGtk3WSCustomListView.ItemGetPosition(
const ALV: TCustomListView; const AIndex: Integer): TPoint;
begin
DebugLn('TGtk3WSCustomListView.ItemGetPosition ');
Result := Point(0, 0); // inherited ItemGetPosition(ALV, AIndex);
//DebugLn('TGtk3WSCustomListView.ItemGetPosition ');
Result := Point(-1, -1); // inherited ItemGetPosition(ALV, AIndex);
if ALV.HandleAllocated then
Result := TGtk3ListView(ALV.Handle).ItemPosition(AIndex);
end;
class procedure TGtk3WSCustomListView.ItemUpdate(const ALV: TCustomListView;
@ -1000,6 +1002,7 @@ begin
if not WSCheckHandleAllocated(ALV, 'SetViewStyle') then
Exit;
DebugLn('TGtk3WSCustomListView.SetViewStyle ');
RecreateWnd(ALV);
// inherited SetViewStyle(ALV, AValue);
end;