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

cocoa: getting rid of unnecessary text change notifications. bug #36578

Browse Source 
git-svn-id: trunk@62562 -
This commit is contained in:
dmitry 2020-01-16 01:52:04 +00:00
parent c6feb9685a
commit 4c6c4baf6e
1 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
lcl/interfaces/cocoa/cocoatextedits.pas
View File

@ -395,10 +395,13 @@ type
procedure scrollWheel(event: NSEvent); override;
end;
TCocoaSpinEdit = objcclass(TCocoaTextField, NSTextFieldDelegateProtocol)
TCocoaSpinEdit = objcclass(TCocoaTextField)
Stepper: NSStepper;
NumberFormatter: NSNumberFormatter;
decimalPlaces: Integer;
avoidChangeEvent: Integer;
//Spin: TCustomFloatSpinEdit;
procedure dealloc; override;
function updateStepper: boolean; message 'updateStepper';
@ -408,9 +411,6 @@ type
procedure PositionSubcontrols(const ALeft, ATop, AWidth, AHeight: Integer); message 'PositionSubcontrols:ATop:AWidth:AHeight:';
procedure StepperChanged(sender: NSObject); message 'StepperChanged:';
procedure textDidChange(notification: NSNotification); override;
procedure textDidEndEditing(notification: NSNotification); message 'textDidEndEditing:'; override;
// NSTextFieldDelegateProtocol
procedure controlTextDidChange(obj: NSNotification); override;
// lcl
function acceptsFirstResponder: LCLObjCBoolean; override;
function lclGetCallback: ICommonCallback; override;
@ -1953,9 +1953,6 @@ begin
Stepper.setTarget(Self);
Stepper.setAction(objcselector('StepperChanged:'));
// Accept numbers only
setDelegate(Self);
{ The default way to do this in Cocoa is with NSNumberFormatter
But it is a bit annoying, it just disallows losing focus from the control
instead of the Windows like solution to just override with the last value
@ -2011,27 +2008,20 @@ begin
setStringValue(lNSStr);
lNSStr.release;
// This implements OnChange for both user and code changes
if callback <> nil then callback.SendOnTextChanged();
if (callback <> nil) and (avoidChangeEvent=0) then
callback.SendOnTextChanged();
end;
procedure TCocoaSpinEdit.textDidChange(notification: NSNotification);
begin
updateStepper;
inherited textDidChange(notification);
end;
procedure TCocoaSpinEdit.textDidEndEditing(notification: NSNotification);
begin
updateStepper;
StepperChanged(nil); // and refresh self
inherited textDidEndEditing(notification);
//if Assigned(callback) then callback.SendOnTextChanged;
end;
procedure TCocoaSpinEdit.controlTextDidChange(obj: NSNotification);
begin
updateStepper;
if Assigned(callback) then callback.SendOnTextChanged;
inc(avoidChangeEvent);
try
updateStepper;
StepperChanged(nil); // and refresh self
inherited textDidChange(notification);
finally
dec(avoidChangeEvent);
end;
end;
function TCocoaSpinEdit.acceptsFirstResponder: LCLObjCBoolean;