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

LCL: Support checked menu items with associated icons in GTK2. Issue #26970, patch from Andrey Zubarev.

Browse Source 
git-svn-id: trunk@47026 -
This commit is contained in:
juha 2014-11-29 12:46:35 +00:00
parent ebbcfd0b72
commit 1bc29130cf
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lcl/interfaces/gtk2/gtk2proc.inc
View File

@ -1184,7 +1184,7 @@ end;
{$IFDEF VerboseGtkToDos}{$note remove when gtk native imagelist will be ready}{$ENDIF}
procedure DrawImageListIconOnWidget(ImgList: TCustomImageList;
Index: integer; AEffect: TGraphicsDrawEffect; DestWidget: PGTKWidget;
Index: integer; AEffect: TGraphicsDrawEffect; Checked: boolean; DestWidget: PGTKWidget;
CenterHorizontally, CenterVertically: boolean;
DestLeft, DestTop: integer);
// draw icon of imagelist centered on gdkwindow
@ -1196,6 +1196,7 @@ var
DestDC: HDC;
Offset: TPoint;
FixedWidget: PGtkWidget;
r:TRect;
begin
if ImgList=nil then exit;
if (Index<0) or (Index>=ImgList.Count) then exit;
@ -1223,6 +1224,12 @@ begin
DestTop := DestWidget^.allocation.y - Offset.y + ((WindowHeight-ImageHeight) div 2);
DestDC := GetDC(HDC({%H-}PtrUInt(DestWidget)));
if Checked then
begin
r:=Rect(DestLeft-2, DestTop-2, ImageWidth+6, ImageHeight+6);
DrawEdge(DestDC,r,EDGE_SUNKEN,BF_ADJUST or BF_FLAT or BF_RECT or BF_SOFT);
end;
//DebugLn('DrawImageListIconOnWidget B DestXY=',DestLeft,',',DestTop,
// ' DestWindowSize=',WindowWidth,',',WindowWidth,
// ' SrcRect=',ImageRect.Left,',',ImageRect.Top,',',ImageWidth,'x',ImageHeight);
@ -1236,7 +1243,7 @@ end;
procedure DrawImageListIconOnWidget(ImgList: TCustomImageList;
Index: integer; DestWidget: PGTKWidget);
begin
DrawImageListIconOnWidget(ImgList, Index, gdeNormal, DestWidget, true, true, 0, 0);
DrawImageListIconOnWidget(ImgList, Index, gdeNormal, false, DestWidget, true, true, 0, 0);
end;
function GetGdkImageBitsPerPixel(Image: PGdkImage): cardinal;
@ -5779,7 +5786,7 @@ begin
if AImageIndex < AImageList.Count then
{$IFDEF VerboseGtkToDos}{$note reimplement}{$ENDIF}
DrawImageListIconOnWidget(AImageList, AImageIndex, AEffect,
Widget, false, false, ALeft, ATop);
LCLMenuItem.Checked, Widget, false, false, ALeft, ATop);
if FreeImageList then
AImageList.Free;