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

LCL/TPanel: New property ShowAccelChar to improve Delphi compatibility in rendering of ampersands. Issue #39973.

Browse Source
This commit is contained in:
wp_xyz 2022-10-28 00:09:56 +02:00
parent fbe7aa44e1
commit eff48575cf
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lcl/extctrls.pp
View File

@ -1084,6 +1084,7 @@ type
FAlignment : TAlignment; FAlignment : TAlignment;
FVertAlignment: TVerticalAlignment; FVertAlignment: TVerticalAlignment;
FFullRepaint: Boolean; FFullRepaint: Boolean;
FShowAccelChar: Boolean;
FWordWrap: Boolean; FWordWrap: Boolean;
procedure PaintBevel(var ARect: TRect; ABevel: TPanelBevel); procedure PaintBevel(var ARect: TRect; ABevel: TPanelBevel);
procedure SetAlignment(const Value : TAlignment); procedure SetAlignment(const Value : TAlignment);
@ -1091,6 +1092,7 @@ type
procedure SetBevelInner(const Value: TPanelBevel); procedure SetBevelInner(const Value: TPanelBevel);
procedure SetBevelOuter(const Value: TPanelBevel); procedure SetBevelOuter(const Value: TPanelBevel);
procedure SetBevelWidth(const Value: TBevelWidth); procedure SetBevelWidth(const Value: TBevelWidth);
procedure SetShowAccelChar(const Value: Boolean);
procedure SetVertAlignment(const Value: TVerticalAlignment); procedure SetVertAlignment(const Value: TVerticalAlignment);
procedure SetWordwrap(const Value: Boolean); procedure SetWordwrap(const Value: Boolean);
protected protected
@ -1104,6 +1106,7 @@ type
procedure Paint; override; procedure Paint; override;
procedure SetParentBackground(const AParentBackground: Boolean); override; procedure SetParentBackground(const AParentBackground: Boolean); override;
procedure UpdateParentColorChange; procedure UpdateParentColorChange;
property ShowAccelChar: Boolean read FShowAccelChar write SetShowAccelChar default false;
property VerticalAlignment: TVerticalAlignment read FVertAlignment write SetVertAlignment default taVerticalCenter; property VerticalAlignment: TVerticalAlignment read FVertAlignment write SetVertAlignment default taVerticalCenter;
property WordWrap: Boolean read FWordwrap write SetWordwrap default false; property WordWrap: Boolean read FWordwrap write SetWordwrap default false;
public public
@ -1159,6 +1162,7 @@ type
property ParentFont; property ParentFont;
property ParentShowHint; property ParentShowHint;
property PopupMenu; property PopupMenu;
property ShowAccelChar;
property ShowHint; property ShowHint;
property TabOrder; property TabOrder;
property TabStop; property TabStop;

10
lcl/include/custompanel.inc
View File

@ -84,6 +84,15 @@ begin
inherited; inherited;
end; end;
procedure TCustomPanel.SetShowAccelChar(const Value: Boolean);
begin
if FShowAccelChar <> Value then
begin
FShowAccelChar := Value;
Invalidate;
end;
end;
procedure TCustomPanel.SetVertAlignment(const Value: TVerticalAlignment); procedure TCustomPanel.SetVertAlignment(const Value: TVerticalAlignment);
begin begin
if FVertAlignment <> Value then if FVertAlignment <> Value then
@ -161,6 +170,7 @@ begin
TS.SystemFont:=Canvas.Font.IsDefault; TS.SystemFont:=Canvas.Font.IsDefault;
TS.Wordbreak := FWordWrap; TS.Wordbreak := FWordWrap;
TS.SingleLine := not FWordwrap; TS.SingleLine := not FWordwrap;
TS.ShowPrefix := FShowAccelChar;
if not Enabled then if not Enabled then
if ThemeServices.ThemesEnabled then if ThemeServices.ThemesEnabled then
Canvas.Font.Color := clGrayText Canvas.Font.Color := clGrayText