Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes in custom components #30

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Changes in custom components #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bd4adf1
Add files via upload
LucaBertoncini Feb 12, 2025
010fa04
Update controls.pas
LucaBertoncini Feb 12, 2025
aba26d5
Update controls.pas
LucaBertoncini Feb 12, 2025
f5616d6
Update stdctrls.pas
LucaBertoncini Feb 12, 2025
f2d708c
Update stdctrls.pas
LucaBertoncini Feb 12, 2025
97950d4
Update stdctrls.pas
LucaBertoncini Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 40 additions & 34 deletions widgets/controls.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,13 @@ TControl = class(TComponent)
procedure SetTabStop(AValue: boolean);
procedure SetText(AValue: TCaption);
procedure SetTop(AValue: NativeInt);
procedure SetVisible(AValue: boolean);
procedure SetWidth(AValue: NativeInt);
protected
procedure SetBorderStyle(AValue: TBorderStyle);
// useful in derived components
procedure SetVisible(AValue: boolean); virtual;
function GetHeight: NativeInt; virtual;
function GetWidth: NativeInt; virtual;
protected
procedure Click; virtual;
procedure DblClick; virtual;
Expand Down Expand Up @@ -369,10 +372,10 @@ TControl = class(TComponent)
published
property Cursor: TCursor read FCursor write SetCursor;
property Left: NativeInt read FLeft write SetLeft;
property Height: NativeInt read FHeight write SetHeight;
property Height: NativeInt read GetHeight write SetHeight;
property Hint: string read FHint write SetHint;
property Top: NativeInt read FTop write SetTop;
property Width: NativeInt read FWidth write SetWidth;
property Width: NativeInt read GetWidth write SetWidth;
end;

{ TWinControl }
Expand Down Expand Up @@ -1184,6 +1187,12 @@ procedure TControl.SetHeight(AValue: NativeInt);
SetBounds(FLeft, FTop, FWidth, AValue);
end;

function TControl.GetHeight: NativeInt;
begin
Result := FHeight;
end;


procedure TControl.SetHint(AValue: string);
begin
if (FHint <> AValue) then
Expand Down Expand Up @@ -1322,6 +1331,11 @@ procedure TControl.SetWidth(AValue: NativeInt);
SetBounds(FLeft, FTop, AValue, FHeight);
end;

function TControl.GetWidth: NativeInt;
begin
Result := FWidth;
end;

procedure TControl.Click;
begin
if (Assigned(FOnClick)) then
Expand Down Expand Up @@ -1552,39 +1566,34 @@ procedure TControl.Changed;
begin
/// Id
if (FHandleId <> '') then
begin
SetAttribute('id', FHandleId);
end
SetAttribute('id', FHandleId)
else
begin
RemoveAttribute('id');
end;

/// Class
if (FHandleClass <> '') then
begin
SetAttribute('class', FHandleClass);
end
SetAttribute('class', FHandleClass)
else
begin
RemoveAttribute('class');
end;


/// Clear font style, it must be set from CSS class or CSS default value
UpdateHtmlElementFont(FHandleElement, nil, True);
Style.removeProperty('color');

/// Style
if (FHandleClass = '') and (FHandleId = '') then
begin
/// Font
Style.SetProperty('color', JSColor(FFont.Color));
UpdateHtmlElementFont(FHandleElement, FFont, False);
/// Color
if (FColor in [clDefault, clNone]) then
begin
Style.RemoveProperty('background-color');
end
Style.RemoveProperty('background-color')
else
begin
Style.SetProperty('background-color', JSColor(FColor));
end;
end
else begin
/// Everything will be set via CSS
Style.RemoveProperty('background-color');
Style.RemoveProperty('border-style');
Style.cssText := '';
end;

/// Bounds
Expand All @@ -1594,16 +1603,18 @@ procedure TControl.Changed;
Style.SetProperty('height', IntToStr(AdjustWithPPI(FHeight)) + 'px');

/// Cursor
Style.SetProperty('cursor', JSCursor(FCursor));
if FCursor = crDefault then
Style.RemoveProperty('cursor')
else
Style.SetProperty('cursor', JSCursor(FCursor));

/// Enabled
if (FEnabled) then
begin
RemoveAttribute('disabled');
Style.RemoveProperty('opacity');
end
else
begin
else begin
SetAttribute('disabled', 'true');
Style.SetProperty('opacity','0.5');
end;
Expand All @@ -1614,21 +1625,16 @@ procedure TControl.Changed;
Style.SetProperty('visibility', 'visible');
Style.SetProperty('display', 'block');
end
else
begin
else begin
Style.SetProperty('visibility', 'hidden');
Style.SetProperty('display', 'none');
end;

/// Hint
if (FHint <> '') and (FShowHint) then
begin
SetAttribute('title', FHint);
end
SetAttribute('title', FHint)
else
begin
RemoveAttribute('title');
end;

/// Border Style
if (FBorderStyle = bsNone) then
Expand All @@ -1646,8 +1652,8 @@ procedure TControl.Changed;
/// Position
Style.SetProperty('position', 'absolute');

/// Scroll
Style.SetProperty('overflow', 'hidden');
/// Scroll must be set via CSS
// Style.SetProperty('overflow', 'hidden');

/// Defines how the width and height of an element are calculated
Style.SetProperty('-webkit-box-sizing', 'border-box');
Expand Down
Loading