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

IdeIntf: Show icons in ActionlistEditor in native size. Fix offset in ImageIndexPropertyEditor. Issue #35810.

Browse Source 
git-svn-id: trunk@62815 -
This commit is contained in:
juha 2020-03-28 11:21:40 +00:00
parent d5e5203170
commit 5a2520082e
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
components/ideintf/actionseditor.pas
View File

@ -27,7 +27,7 @@ uses
Classes, SysUtils, contnrs,
// LCL
LCLType, LCLProc, Forms, Controls, Dialogs, ExtCtrls, StdCtrls,
Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList,
Graphics, Menus, ComCtrls, DBActns, StdActns, ActnList, ImgList,
// IDEIntf
ObjInspStrConsts, ComponentEditors, PropEdits, PropEditUtils, IDEWindowIntf,
IDEImagesIntf;
@ -756,14 +756,17 @@ end;
procedure TActionListEditor.lstActionNameDrawItem(Control: TWinControl;
Index: Integer; ARect: TRect; State: TOwnerDrawState);
var
lb: TListBox;
ACanvas: TCanvas;
R: TRect;
dh, dth: Integer;
dh: Integer;
Imgs: TCustomImageList;
AAction: TCustomAction;
S: String;
begin
if FActionList=nil then exit;;
ACanvas := TListBox(Control).Canvas;
if FActionList=nil then exit;
lb := TListBox(Control);
ACanvas := lb.Canvas;
if odSelected in State then
begin
ACanvas.Brush.Color := clHighlight;
@ -773,27 +776,21 @@ begin
ACanvas.Brush.Color := clWindow;
ACanvas.Font.Color := clWindowText;
end;
S := TListBox(Control).Items[Index];
R := ARect;
dh := R.Bottom - R.Top;
ACanvas.FillRect(R);
inc(R.Left, 2);
if (TListBox(Control).Items.Objects[Index] is TCustomAction)
and (FActionList.Images <> nil) then begin
AAction := TListBox(Control).Items.Objects[Index] as TCustomAction;
Imgs := FActionList.Images;
if (lb.Items.Objects[Index] is TCustomAction) and Assigned(Imgs) then
begin
AAction := TCustomAction(lb.Items.Objects[Index]);
R.Right := R.Left + dh;
if AAction.ImageIndex <> -1 then
begin
dth := FActionList.Images.Height;
if dth > dh then
FActionList.Images.StretchDraw(ACanvas, AAction.ImageIndex, Rect(R.Left, R.Top + 1, R.Left + dh - 2, R.Bottom - 1))
else
FActionList.Images.Draw(ACanvas, R.Left, R.Top + (dh -dth) div 2, AAction.ImageIndex);
end;
Imgs.Draw(ACanvas, R.Left, R.Top + (dh-Imgs.Height) div 2, AAction.ImageIndex);
Inc(R.Left, dh + 2);
end;
dth := Canvas.TextHeight(S);
ACanvas.TextOut(R.Left, R.Top + (dh - dth) div 2, S);
S := lb.Items[Index];
ACanvas.TextOut(R.Left, R.Top + (dh-Canvas.TextHeight(S)) div 2, S);
if odFocused in State then
ACanvas.DrawFocusRect(ARect);
end;
@ -906,7 +903,12 @@ begin
if FActionList = AActionList then exit;
if FActionList<>nil then RemoveFreeNotification(FActionList);
FActionList := AActionList;
if FActionList<>nil then FreeNotification(FActionList);
if FActionList<>nil then
begin
FreeNotification(FActionList);
if FActionList.Images<>nil then
lstActionName.ItemHeight := FActionList.Images.Height;
end;
FillCategories;
//FillActionByCategory(-1);
end;

12
components/ideintf/graphpropedits.pas
View File

@ -759,27 +759,27 @@ procedure TImageIndexPropertyEditor.ListDrawValue(const CurValue: ansistring;
var
Images: TCustomImageList;
R: TRect;
OldColor: TColor;
dh: Integer;
begin
if GetDefaultOrdValue <> NoDefaultValue then
Dec(Index);
Images := GetImageList;
R := ARect;
dh := R.Bottom - R.Top; // Rect height.
if Assigned(Images) then
begin
if (pedsInComboList in AState) and not (pedsInEdit in AState) then
begin
OldColor := ACanvas.Brush.Color;
if pedsSelected in AState then
ACanvas.Brush.Color := clHighlight
else
ACanvas.Brush.Color := clWhite;
ACanvas.FillRect(R);
ACanvas.Brush.Color := OldColor;
end;
Images.Draw(ACanvas, R.Left + 1, R.Top + 1, Index, True);
R.Left := R.Left + Images.Width + 2;
Images.Draw(ACanvas, R.Left + 1, R.Top + 1, Index);
Inc(R.Left, Images.Width + 2);
// The numeric value in list goes too low without an adjustment. Why?
Dec(R.Top, (dh - ACanvas.TextHeight(CurValue)) div 2);
end;
inherited ListDrawValue(CurValue, Index, ACanvas, R, AState);
end;