paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-10-30 07:01:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

TurboPower_iPro: Final fix of issue {{MantisLink|29483}} - Use correct default of input node background color, assign it to the control's color.

Browse Source 
git-svn-id: trunk@51447 -
This commit is contained in:
wp 2016-01-29 14:23:46 +00:00
parent 3f9aa4b863
commit cfd5a7b71c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/turbopower_ipro/iphtml.pas
View File

@ -11426,7 +11426,7 @@ begin
FControl := TEdit.Create(Parent); FControl := TEdit.Create(Parent);
setCommonProperties; setCommonProperties;
with TEdit(FControl) do begin with TEdit(FControl) do begin
Color := clWindow; // clDefault renders as black in Windows Color := Brush.Color;
Text := Value; Text := Value;
MaxLength := Self.MaxLength; MaxLength := Self.MaxLength;
SetWidthHeight(Self.Size, 8, 0); SetWidthHeight(Self.Size, 8, 0);
@ -11441,10 +11441,10 @@ begin
FControl := TEdit.Create(Parent); FControl := TEdit.Create(Parent);
setCommonProperties; setCommonProperties;
with TEdit(FControl) do begin with TEdit(FControl) do begin
Color := clWindow; Color := Brush.Color;
Text := Value; Text := Value;
MaxLength := Self.MaxLength; MaxLength := Self.MaxLength;
SetWidthHeight(1, 8, 0); SetWidthHeight(Self.Size, 8, 0);
Enabled := not Self.Disabled; Enabled := not Self.Disabled;
ReadOnly := Self.ReadOnly; ReadOnly := Self.ReadOnly;
PasswordChar := '*'; PasswordChar := '*';
@ -11457,6 +11457,7 @@ begin
FControl := TCheckBox.Create(Parent); FControl := TCheckBox.Create(Parent);
setCommonProperties; setCommonProperties;
with TCheckBox(FControl) do begin with TCheckBox(FControl) do begin
Color := Brush.Color;
SetWidthHeight(1, 8, 0); SetWidthHeight(1, 8, 0);
Checked := Self.Checked; Checked := Self.Checked;
Enabled := not Self.Disabled and not Self.Readonly; Enabled := not Self.Disabled and not Self.Readonly;
@ -11478,6 +11479,7 @@ begin
{$ELSE} {$ELSE}
with THtmlRadioButton(FControl) do begin with THtmlRadioButton(FControl) do begin
{$ENDIF} {$ENDIF}
Color := Brush.Color;
SetWidthHeight(1, 8, 0); SetWidthHeight(1, 8, 0);
Checked := Self.Checked; Checked := Self.Checked;
Enabled := not Self.Disabled and not Self.Readonly; Enabled := not Self.Disabled and not Self.Readonly;
@ -11494,6 +11496,7 @@ begin
Caption := Self.Value Caption := Self.Value
else else
Caption := SHtmlDefSubmitCaption; Caption := SHtmlDefSubmitCaption;
Color := Brush.Color;
Width := aCanvas.TextWidth(Caption) + 40; Width := aCanvas.TextWidth(Caption) + 40;
Height := aCanvas.TextHeight(Caption) + 10; Height := aCanvas.TextHeight(Caption) + 10;
Enabled := not Self.Disabled and not Self.Readonly; Enabled := not Self.Disabled and not Self.Readonly;
@ -11509,6 +11512,7 @@ begin
Caption := Self.Value Caption := Self.Value
else else
Caption := SHtmlDefResetCaption; Caption := SHtmlDefResetCaption;
Color := Brush.Color;
Width := aCanvas.TextWidth(Caption) + 40; Width := aCanvas.TextWidth(Caption) + 40;
Height := aCanvas.TextHeight(Caption) + 10; Height := aCanvas.TextHeight(Caption) + 10;
Enabled := not Self.Disabled and not Self.Readonly; Enabled := not Self.Disabled and not Self.Readonly;
@ -11540,7 +11544,7 @@ begin
FFileEdit := TEdit.Create(Parent); FFileEdit := TEdit.Create(Parent);
with FFileEdit do begin with FFileEdit do begin
Parent := FControl; Parent := FControl;
Color := clWindow; Color := Brush.Color;
Left := 1; Left := 1;
Top := 1; Top := 1;
Width := FControl.Width - FFileSelect.Width; Width := FControl.Width - FFileSelect.Width;
@ -11736,6 +11740,7 @@ constructor TIpHtmlNodeINPUT.Create(ParentNode: TIpHtmlNode);
begin begin
inherited; inherited;
FElementName := 'input'; FElementName := 'input';
Props.BgColor := clWhite;
end; end;
destructor TIpHtmlNodeINPUT.Destroy; destructor TIpHtmlNodeINPUT.Destroy;