paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-03 23:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

cocoa: check and radio change event notification #33063

Browse Source 
git-svn-id: trunk@57142 -
This commit is contained in:
dmitry 2018-01-23 06:56:54 +00:00
parent 88ccde9a8e
commit f234188327
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/interfaces/cocoa/cocoaprivate.pp
View File

@ -243,6 +243,8 @@ type
// lcl overrides
function lclIsHandle: Boolean; override;
procedure lclSetFrame(const r: TRect); override;
// cocoa
procedure setState(astate: NSInteger); override;
end;
TCocoaFieldEditor = objcclass;
@ -2265,6 +2267,15 @@ begin
inherited lclSetFrame(r);
end;
procedure TCocoaButton.setState(astate: NSInteger);
var
ch : Boolean;
begin
ch := astate<>state;
inherited setState(astate);
if Assigned(callback) and ch then callback.SendOnChange;
end;
procedure TCocoaButton.actionButtonClick(sender: NSObject);
begin
// this is the action handler of button

30
lcl/interfaces/cocoa/cocoawsstdctrls.pp
View File

@ -259,6 +259,7 @@ type
TCocoaWSRadioButton = class(TWSRadioButton)
published
class function CreateHandle(const AWinControl: TWinControl; const AParams: TCreateParams): TLCLIntfHandle; override;
class procedure SetState(const ACustomCheckBox: TCustomCheckBox; const NewState: TCheckBoxState); override;
end;
{ TCocoaWSCustomStaticText }
@ -283,6 +284,7 @@ procedure TextViewSetWordWrap(txt: NSTextView; lScroll: NSScrollView; NewWordWra
function AlignmentLCLToCocoa(al: TAlignment): NSTextAlignment;
procedure TextViewSetAllignment(txt: NSTextView; align: TAlignment);
procedure TextFieldSetAllignment(txt: NSTextField; align: TAlignment);
procedure RadioButtonSwitchSiblings(checkedRadio: NSButton);
implementation
@ -367,6 +369,18 @@ begin
end;
end;
procedure RadioButtonSwitchSiblings(checkedRadio: NSButton);
var
SubView : NSView;
begin
if not Assigned(checkedRadio) then Exit;
for SubView in checkedRadio.superView.subviews do
if (SubView <> checkedRadio) and (SubView.lclGetTarget is TRadioButton) then
begin
NSButton(SubView).setState(NSOffState);
end;
end;
{ TLCLRadioButtonCallback }
procedure TLCLRadioButtonCallback.ButtonClick;
@ -375,11 +389,7 @@ var
begin
if not Owner.lclIsEnabled() then Exit;
if NSButton(Owner).state = NSOnState then
begin
for SubView in NSButton(Owner).superView.subviews do
if (SubView <> Owner) and (SubView.lclGetTarget is TRadioButton) then
NSButton(SubView).setState(NSOffState);
end;
RadioButtonSwitchSiblings(NSButton(Owner));
inherited ButtonClick;
end;
@ -595,7 +605,9 @@ const
buttonState: array [TcheckBoxState] of NSInteger = (NSOffState, NSOnState, NSMixedState);
begin
if ACustomCheckBox.HandleAllocated then
begin
NSButton(ACustomCheckBox.Handle).setState(buttonState[NewState]);
end;
end;
class procedure TCocoaWSCustomCheckBox.GetPreferredSize(
@ -644,6 +656,14 @@ begin
Result := TLCLIntfHandle(btn);
end;
class procedure TCocoaWSRadioButton.SetState(
const ACustomCheckBox: TCustomCheckBox; const NewState: TCheckBoxState);
begin
if NewState = cbChecked then
RadioButtonSwitchSiblings(NSButton(ACustomCheckBox.Handle));
TCocoaWSCustomCheckBox.SetState(ACustomCheckBox, NewState);
end;
{ TCocoaWSCustomStaticText }
class function TCocoaWSCustomStaticText.CreateHandle(const AWinControl: TWinControl;