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

LCL Carbon: fixed TEdit and TComboBox autosizing

Browse Source 
git-svn-id: trunk@14232 -
This commit is contained in:
tombo 2008-02-22 14:27:42 +00:00
parent a21128f663
commit 01476eddd4
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lcl/interfaces/carbon/carbonedits.pp
View File

@ -53,6 +53,8 @@ type
public
procedure TextDidChange; dynamic;
public
function GetPreferredSize: TPoint; override;
function GetSelStart(var ASelStart: Integer): Boolean;
function GetSelLength(var ASelLength: Integer): Boolean;
function SetSelStart(ASelStart: Integer): Boolean;
@ -86,6 +88,7 @@ type
procedure FocusKilled; override;
public
function GetText(var S: String): Boolean; override;
function SetBounds(const ARect: TRect): Boolean; override;
procedure SetReadOnly(AReadOnly: Boolean); override;
function GetItemIndex: Integer;
@ -282,6 +285,16 @@ begin
DeliverMessage(LCLObject, Msg);
end;
{------------------------------------------------------------------------------
Method: TCarbonControlWithEdit.GetPreferredSize
Returns: The preffered size of control for autosizing or (0, 0)
------------------------------------------------------------------------------}
function TCarbonControlWithEdit.GetPreferredSize: TPoint;
begin
Result := inherited GetPreferredSize;
Result.X := 0; // don not autosize width of edit like controls
end;
{------------------------------------------------------------------------------
Method: TCarbonControlWithEdit.GetSelStart
Params: ASelStart - Selection start
@ -684,6 +697,23 @@ begin
Result := inherited GetText(S);
end;
{------------------------------------------------------------------------------
Method: TCarbonComboBox.SetBounds
Params: ARect - Record for control coordinates
Returns: If function succeeds
Sets the control bounding rectangle relative to the client origin of its
parent
------------------------------------------------------------------------------}
function TCarbonComboBox.SetBounds(const ARect: TRect): Boolean;
var
R: TRect;
begin
R := ARect;
R.Bottom := R.Top + GetPreferredSize.Y;
Result := inherited SetBounds(R);
end;
{------------------------------------------------------------------------------
Method: TCarbonComboBox.SetReadOnly
Params: AReadOnly - Read only behavior
@ -1368,12 +1398,12 @@ begin
Attrs[2].size := kTXNQDFontSizeAttributeSize;
Attrs[2].data.dataValue := AFont.Size;
TCarbonFont(AFont.Handle).SetColor(AFont.Color);
TCarbonFont(AFont.Reference.Handle).SetColor(AFont.Color);
// font style
Attrs[3].tag := kTXNATSUIStyle;
Attrs[3].size := kTXNATSUIStyleSize;
Attrs[3].data.dataPtr := Pointer(TCarbonFont(AFont.Handle).Style);
Attrs[3].data.dataPtr := Pointer(TCarbonFont(AFont.Reference.Handle).Style);
// apply
OSError(

1
lcl/interfaces/carbon/carbonlclintf.inc
View File

@ -572,7 +572,6 @@ var
displayID: CGDirectDisplayID;
ScreenImage: CGImageRef;
dataProvider: CGDataProviderRef;
data: CFDataRef;
begin
Result := False;