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

cocoa: added code, but not enforcing it for change in border style of TComboBox

Browse Source 
git-svn-id: trunk@59035 -
This commit is contained in:
dmitry 2018-09-16 17:49:16 +00:00
parent d809d8c95b
commit d17ec595bb
1 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lcl/interfaces/cocoa/cocoawsstdctrls.pas
View File

@ -72,6 +72,8 @@ type
TCocoaWSCustomComboBox = class(TWSCustomComboBox)
published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
class procedure SetBorderStyle(const AWinControl: TWinControl; const ABorderStyle: TBorderStyle); override;
{class function GetSelStart(const ACustomComboBox: TCustomComboBox): integer; override;
class function GetSelLength(const ACustomComboBox: TCustomComboBox): integer; override;}
class function GetItemIndex(const ACustomComboBox: TCustomComboBox): integer; override;
@ -321,7 +323,7 @@ function ComboBoxStyleIsReadOnly(AStyle: TComboBoxStyle): Boolean;
function ComboBoxIsReadOnly(cmb: TCustomComboBox): Boolean;
function ComboBoxIsOwnerDrawn(AStyle: TComboBoxStyle): Boolean;
function ComboBoxIsVariable(AStyle: TComboBoxStyle): Boolean;
procedure ComboBoxSetBorderStyle(box: NSComboBox; astyle: TBorderStyle);
implementation
@ -449,6 +451,12 @@ begin
Result := AStyle in [csOwnerDrawVariable, csOwnerDrawEditableVariable];
end;
procedure ComboBoxSetBorderStyle(box: NSComboBox; astyle: TBorderStyle);
begin
if astyle = bsNone then box.setBezeled(false)
else box.setBezeled(true);
end;
{ TLCLRadioButtonCallback }
procedure TLCLRadioButtonCallback.ButtonClick;
@ -1514,6 +1522,10 @@ end;
{ TCocoaWSCustomComboBox }
type
TCustomComboBoxAccess = class(TCustomComboBox)
end;
class function TCocoaWSCustomComboBox.CreateHandle(const AWinControl:TWinControl;
const AParams:TCreateParams):TLCLIntfHandle;
var
@ -1545,6 +1557,10 @@ begin
cmb.setDelegate(cmb);
cmb.setStringValue(NSStringUtf8(AParams.Caption));
cmb.callback:=TLCLComboboxCallback.Create(cmb, AWinControl);
// default BorderStyle for TComboBox is bsNone! and it looks ugly!
// also, Win32 doesn't suppot borderstyle for TComboBox at all.
// to be tested and considered
//ComboBoxSetBorderStyle(cmb, TCustomComboBoxAccess(AWinControl).BorderStyle);
Result:=TLCLIntfHandle(cmb);
end;
//todo: 26 pixels is the height of 'normal' combobox. The value is taken from the Interface Builder!
@ -1552,6 +1568,24 @@ begin
AWinControl.Constraints.SetInterfaceConstraints(0,COMBOBOX_MINI_HEIGHT,0,COMBOBOX_REG_HEIGHT);
end;
class procedure TCocoaWSCustomComboBox.SetBorderStyle(
const AWinControl: TWinControl; const ABorderStyle: TBorderStyle);
var
ACustomComboBox : TCustomComboBox;
begin
if not Assigned(AWinControl) or not AWinControl.HandleAllocated then Exit;
ACustomComboBox:= TCustomComboBox(AWinControl);
if ACustomComboBox.ReadOnly then
//Result := TCocoaReadOnlyComboBox(ACustomComboBox.Handle).indexOfSelectedItem
else
begin
//todo: consider the use of border style
//ComboBoxSetBorderStyle(TCocoaComboBox(ACustomComboBox.Handle), ABorderStyle);
end;
end;
class function TCocoaWSCustomComboBox.GetItemIndex(const ACustomComboBox:
TCustomComboBox):integer;
begin