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

LCL: Don't use PassWordChar when showing TextHint. Patch by riderkick. Issue #0029748.

Browse Source 
git-svn-id: trunk@51742 -
This commit is contained in:
bart 2016-02-28 09:52:14 +00:00
parent 1da728d17b
commit 8e8380449e
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lcl/include/customedit.inc
View File

@ -362,9 +362,21 @@ begin
FModified := Value;
end;
function TCustomEdit.GetPasswordChar: Char;
begin
if FTextHintShowing then
Result := FSavedPasswordChar
else
Result := FPasswordChar;
end;
procedure TCustomEdit.SetPasswordChar(const AValue: Char);
begin
if FTextHintShowing and (not FSettingTextHint) and (FSavedPasswordChar<>AValue) then
begin
FSavedPasswordChar := AValue;
Exit;
end;
if FPasswordChar=AValue then exit;
FPasswordChar:=AValue;
@ -642,6 +654,7 @@ begin
FSavedFontColor := Font.Color;
FSavedFontStyle := Font.Style;
FSavedParentFont := ParentFont;
FSavedPasswordChar := PasswordChar;
end;
FTextHintShowing := True;
OldModified := Modified;
@ -651,6 +664,7 @@ begin
inherited RealSetText(FTextHint);
Font.Color := FTextHintFontColor;
Font.Style := FTextHintFontStyle;
PasswordChar := #0;
finally
FSettingTextHint := False;
Modified := OldModified;
@ -667,6 +681,7 @@ begin
Font.Color := FSavedFontColor;
Font.Style := FSavedFontStyle;
ParentFont := FSavedParentFont;
PasswordChar := FSavedPasswordChar;
FTextHintShowing := False;
FSettingTextHint := True;
inherited RealSetText('');

4
lcl/stdctrls.pp
View File

@ -715,6 +715,7 @@ type
FSavedFontColor: TColor;
FSavedFontStyle: TFontStyles;
FSavedParentFont: Boolean;
FSavedPasswordChar: Char;
procedure SetTextHint(AValue: TTranslateString);
procedure ShowTextHint;
procedure HideTextHint;
@ -725,6 +726,7 @@ type
procedure SetHideSelection(const AValue: Boolean);
procedure SetMaxLength(Value: Integer);
procedure SetModified(Value: Boolean);
function GetPasswordChar: Char;
procedure SetPasswordChar(const AValue: Char);
protected
class procedure WSRegisterClass; override;
@ -785,7 +787,7 @@ type
property Modified: Boolean read GetModified write SetModified;
property NumbersOnly: Boolean read GetNumbersOnly write SetNumbersOnly default false;
property OnChange: TNotifyEvent read FOnChange write FOnChange;
property PasswordChar: Char read FPasswordChar write SetPasswordChar default #0;
property PasswordChar: Char read GetPasswordChar write SetPasswordChar default #0;
property PopupMenu;
property ReadOnly: Boolean read GetReadOnly write SetReadOnly default false;
property SelLength: integer read GetSelLength write SetSelLength;