From a0642273b54818fdec39c419858f5da209b769b4 Mon Sep 17 00:00:00 2001
From: sekelsenmat <sekelsenmat@lazarus-ide.org>
Date: Mon, 20 Oct 2014 20:35:42 +0000
Subject: [PATCH] lcl-cocoa: Further implements SpinEdit, now clicking changes
 the value

git-svn-id: trunk@46628 -
---
 lcl/interfaces/cocoa/cocoaprivate.pp   | 36 +++++++++++++++++++-------
 lcl/interfaces/cocoa/cocoawscommon.pas | 21 +++++++--------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/lcl/interfaces/cocoa/cocoaprivate.pp b/lcl/interfaces/cocoa/cocoaprivate.pp
index 82459db4fc..6655aae6a6 100644
--- a/lcl/interfaces/cocoa/cocoaprivate.pp
+++ b/lcl/interfaces/cocoa/cocoaprivate.pp
@@ -760,16 +760,19 @@ type
     callback: ICommonCallback;
     Stepper: NSStepper;
     Edit: NSTextField;
+    Spin: TCustomFloatSpinEdit;
     procedure dealloc; override;
     procedure UpdateControl(ASpinEdit: TCustomFloatSpinEdit); message 'UpdateControl:';
     procedure CreateSubcontrols(ASpinEdit: TCustomFloatSpinEdit; const AParams: TCreateParams); message 'CreateSubControls:AParams:';
-    procedure ActionHandler(sender: NSObject); message 'ActionHandler:';
+    procedure StepperChanged(sender: NSObject); message 'StepperChanged:';
     function acceptsFirstResponder: Boolean; override;
     function becomeFirstResponder: Boolean; override;
     function resignFirstResponder: Boolean; override;
     function lclGetCallback: ICommonCallback; override;
     procedure lclClearCallback; override;
     function lclIsHandle: Boolean; override;
+    // NSViewFix
+    function fittingSize: NSSize; override;
   end;
 
 
@@ -3347,6 +3350,9 @@ begin
   Stepper.setMinValue(ASpinEdit.MinValue);
   Stepper.setIncrement(ASpinEdit.Increment);
   Stepper.setDoubleValue(ASpinEdit.Value);
+
+  // update the UI too
+  StepperChanged(Self);
 end;
 
 procedure TCocoaSpinEdit.CreateSubcontrols(ASpinEdit: TCustomFloatSpinEdit; const AParams: TCreateParams);
@@ -3355,9 +3361,7 @@ const
 var
   lParams: TCreateParams;
 begin
-  // General control setup
-  setTarget(Self);
-  setAction(objcselector('ActionHandler:'));
+  Spin := ASpinEdit;
 
   // Now creates the subcontrols
   lParams := AParams;
@@ -3368,19 +3372,26 @@ begin
   lParams.Width := DEFAULT_STEPPER_WIDTH;
   lParams.X := AParams.Width - DEFAULT_STEPPER_WIDTH;
   Stepper := NSStepper.alloc.lclInitWithCreateParams(lParams);
+  Stepper.setValueWraps(False);
 
   lParams.Width := AParams.Width - DEFAULT_STEPPER_WIDTH;
   lParams.X := 0;
   Edit := NSTextField.alloc.lclInitWithCreateParams(lParams);
+
+  // Change event for the stepper
+  Stepper.setTarget(Self);
+  Stepper.setAction(objcselector('StepperChanged:'));
 end;
 
-procedure TCocoaSpinEdit.ActionHandler(sender: NSObject);
+procedure TCocoaSpinEdit.StepperChanged(sender: NSObject);
 var
-  lStr: NSString;
+  lNSStr: NSString;
+  lStr: string;
 begin
-  lStr := CocoaUtils.NSStringUtf8(Format('%f', [Stepper.doubleValue()]));
-  Edit.setStringValue(lStr);
-  lStr.release;
+  lStr := Format('%.*f', [Spin.DecimalPlaces, Stepper.doubleValue()]);
+  lNSStr := CocoaUtils.NSStringUtf8(lStr);
+  Edit.setStringValue(lNSStr);
+  lNSStr.release;
 end;
 
 function TCocoaSpinEdit.acceptsFirstResponder: Boolean;
@@ -3417,5 +3428,12 @@ begin
   Result := True;
 end;
 
+function TCocoaSpinEdit.fittingSize: NSSize;
+begin
+  Result.width := -1;
+  Edit.sizeToFit();
+  Result.height := Edit.bounds.size.height;
+end;
+
 end.
 
diff --git a/lcl/interfaces/cocoa/cocoawscommon.pas b/lcl/interfaces/cocoa/cocoawscommon.pas
index f737669f57..863598f3b4 100644
--- a/lcl/interfaces/cocoa/cocoawscommon.pas
+++ b/lcl/interfaces/cocoa/cocoawscommon.pas
@@ -1219,20 +1219,19 @@ class procedure TCocoaWSWinControl.GetPreferredSize(
   const AWinControl: TWinControl; var PreferredWidth, PreferredHeight: integer;
   WithThemeSpace: Boolean);
 var
-  Obj: NSObject;
+  lView: NSView;
   Size: NSSize;
 begin
-  if AWinControl.HandleAllocated then
+  if not AWinControl.HandleAllocated then Exit;
+
+  lView := CocoaUtils.GetNSObjectView(NSObject(AWinControl.Handle));
+  if lView = nil then Exit;
+
+  if lView.respondsToSelector(objcselector('fittingSize')) then
   begin
-    Obj := NSObject(AWinControl.Handle);
-{
-    if Obj.isKindOfClass_(NSView) and obj.respondsToSelector(objcselector('fittingSize')) then
-    begin
-      Size := NSView(Obj).fittingSize;
-      PreferredWidth := Round(Size.width);
-      PreferredHeight := Round(Size.height);
-    end;
-}
+    Size := lView.fittingSize();
+    PreferredWidth := Round(Size.width);
+    PreferredHeight := Round(Size.height);
   end;
 end;