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

IDE: menueditor: high-dpi menu icons

Browse Source 
git-svn-id: trunk@57930 -
This commit is contained in:
ondrej 2018-05-13 21:25:51 +00:00
parent e58e0a48d1
commit 815bedd1ec
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
designer/menueditor.pp
View File

@ -2285,7 +2285,7 @@ var
x:=(r.Right - r.Left - sz.cx) div 2; x:=(r.Right - r.Left - sz.cx) div 2;
if FRealItem.HasIcon and (FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) then begin if FRealItem.HasIcon and (FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) then begin
pt:=GetIconTopLeft; pt:=GetIconTopLeft;
FShadowMenu.FMenu.Images.Draw(Canvas, 0, pt.y, FRealItem.ImageIndex); FShadowMenu.FMenu.Images.DrawForControl(Canvas, 0, pt.y, FRealItem.ImageIndex, FShadowMenu.FMenu.ImagesWidth, Self);
Inc(x, MenuBar_Text_Offset); Inc(x, MenuBar_Text_Offset);
end end
else if (FRealItem.Bitmap <> nil) and not FRealItem.Bitmap.Empty then begin else if (FRealItem.Bitmap <> nil) and not FRealItem.Bitmap.Empty then begin
@ -2312,7 +2312,7 @@ var
end; end;
ThemeServices.DrawElement(Canvas.Handle, dets, r); ThemeServices.DrawElement(Canvas.Handle, dets, r);
if FRealItem.HasIcon and (FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) then if FRealItem.HasIcon and (FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) then
ThemeServices.DrawIcon(Canvas, dets, Point(0,0), FShadowMenu.FMenu.Images, FRealItem.ImageIndex) ThemeServices.DrawIcon(Canvas, dets, Point(0,0), FShadowMenu.FMenu.Images, FRealItem.ImageIndex, 0, Self)
else if (FRealItem.Bitmap <> nil) and not FRealItem.Bitmap.Empty then begin else if (FRealItem.Bitmap <> nil) and not FRealItem.Bitmap.Empty then begin
pt:=GetBitmapLeftTop; pt:=GetBitmapLeftTop;
Canvas.Draw(pt.x, pt.y, RealItem.Bitmap); Canvas.Draw(pt.x, pt.y, RealItem.Bitmap);
@ -2387,13 +2387,13 @@ var
(FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) and (FRealItem.ImageIndex > -1) and (FShadowMenu.FMenu.Images <> nil) and
(FRealItem.ImageIndex < FShadowMenu.FMenu.Images.Count) then (FRealItem.ImageIndex < FShadowMenu.FMenu.Images.Count) then
ThemeServices.DrawIcon(Canvas, dets, GetIconTopLeft, ThemeServices.DrawIcon(Canvas, dets, GetIconTopLeft,
FShadowMenu.FMenu.Images, FRealItem.ImageIndex) FShadowMenu.FMenu.Images, FRealItem.ImageIndex, 0, Self)
else else
if (FRealItem.ImageIndex > -1) and (FParentBox.Level > 0) and if (FRealItem.ImageIndex > -1) and (FParentBox.Level > 0) and
(FRealItem.Parent.SubMenuImages <> nil) and (FRealItem.Parent.SubMenuImages <> nil) and
(FRealItem.ImageIndex < FRealItem.Parent.SubMenuImages.Count) then (FRealItem.ImageIndex < FRealItem.Parent.SubMenuImages.Count) then
ThemeServices.DrawIcon(Canvas, dets, GetSubImagesIconTopLeft, ThemeServices.DrawIcon(Canvas, dets, GetSubImagesIconTopLeft,
RealItem.Parent.SubMenuImages, RealItem.ImageIndex) RealItem.Parent.SubMenuImages, RealItem.ImageIndex, 0, Self)
else if FRealItem.HasBitmap and not FRealItem.Bitmap.Empty then begin else if FRealItem.HasBitmap and not FRealItem.Bitmap.Empty then begin
pt:=GetBitmapLeftTop; pt:=GetBitmapLeftTop;
Canvas.Draw(pt.x, pt.y, RealItem.Bitmap); Canvas.Draw(pt.x, pt.y, RealItem.Bitmap);