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

cocoa: datepicker code cleanup. Added mouse handling events, aspect ratio maintenance - keeping ratio at all times, even if too small

Browse Source 
git-svn-id: trunk@61192 -
This commit is contained in:
dmitry 2019-05-10 03:55:40 +00:00
parent 48ed31da02
commit 416f2defec
2 changed files with 74 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
lcl/interfaces/cocoa/cocoadatepicker.pas
View File

@ -26,7 +26,16 @@ type
function lclGetCallback: ICommonCallback; override;
procedure mouseDown(event: NSEvent); override;
procedure mouseUp(event: NSEvent); override;
procedure mouseMoved(event: NSEvent); override;
procedure mouseDragged(event: NSEvent); override;
procedure rightMouseDown(event: NSEvent); override;
procedure rightMouseUp(event: NSEvent); override;
procedure rightMouseDragged(event: NSEvent); override;
procedure otherMouseDown(event: NSEvent); override;
procedure otherMouseUp(event: NSEvent); override;
procedure otherMouseDragged(event: NSEvent); override;
procedure scrollWheel(event: NSEvent); override;
function acceptsFirstResponder: LCLObjCBoolean; override;
@ -80,6 +89,8 @@ var
fsz : NSSize;
sz : NSSize;
rt : double;
wr : double;
hr : double;
begin
inherited setFrame(aframe);
if not autoResize then Exit;
@ -96,16 +107,75 @@ begin
if (fsz.width=0) or (fsz.height=0) then Exit;
sz:=frame.size;
//don't resize if too small already
if (sz.width<fsz.width) or (sz.height<fsz.height) then Exit;
// resize even if too small already
if retainAspectRatio and (fsz.height>0) then
if retainAspectRatio and (fsz.height>0) and (fsz.width>0)then
begin
rt:=fsz.width/fsz.height;
fsz.width:=fsz.width * sz.width / (sz.height*rt);
wr:=sz.width / fsz.width;
hr:=sz.height / fsz.height;
if wr > hr then
fsz.width:=fsz.width * sz.width / (sz.height*rt)
else
fsz.height:=fsz.height * sz.height / (sz.width / rt);
end;
setBoundsSize(fsz);
end;
procedure TCocoaDatePicker.mouseUp(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseUpDownEvent(event) then
inherited mouseUp(event);
end;
procedure TCocoaDatePicker.rightMouseDown(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseUpDownEvent(event) then
inherited rightMouseDown(event);
end;
procedure TCocoaDatePicker.rightMouseUp(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseUpDownEvent(event) then
inherited rightMouseUp(event);
end;
procedure TCocoaDatePicker.rightMouseDragged(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseMove(event) then
inherited rightMouseDragged(event);
end;
procedure TCocoaDatePicker.mouseDragged(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseMove(event) then
//inherited mouseDragged(event)
;
end;
procedure TCocoaDatePicker.otherMouseDown(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseUpDownEvent(event) then
inherited otherMouseDown(event);
end;
procedure TCocoaDatePicker.otherMouseUp(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseUpDownEvent(event) then
inherited otherMouseUp(event);
end;
procedure TCocoaDatePicker.otherMouseDragged(event: NSEvent);
begin
if not Assigned(callback) or not callback.MouseMove(event) then
inherited otherMouseDragged(event);
end;
procedure TCocoaDatePicker.scrollWheel(event: NSEvent);
begin
if not Assigned(callback) or not callback.scrollWheel(event) then
inherited scrollWheel(event);
end;
end.

4
lcl/interfaces/cocoa/cocoawsdatepicker.pas
View File

@ -104,10 +104,6 @@ class function TCocoaWSCustomCalendar.CreateHandle(const AWinControl: TWinContro
var
dp: TCocoaDatePicker;
Params: TCreateParams;
sz: NSSize;
rt: double;
fsz: NSSize;
w: double;
begin
dp:= AllocDatePicker(AWinControl, AParams);
dp.autoResize := true;