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

cocoa: fix some sizing/positioning code like GetClientRect

Browse Source 
git-svn-id: trunk@34149 -
This commit is contained in:
paul 2011-12-13 09:19:06 +00:00
parent f2b683630b
commit a206f65bcd
3 changed files with 91 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ type
function lclIsVisible: Boolean; message 'lclIsVisible'; reintroduce;
procedure lclInvalidateRect(const r: TRect); message 'lclInvalidateRect:'; reintroduce;
procedure lclInvalidate; message 'lclInvalidate'; reintroduce;
procedure lclRelativePos(var Left, Top: Integer); message 'lclRelativePos::'; reintroduce;
procedure lclLocalToScreen(var X,Y: Integer); message 'lclLocalToScreen::'; reintroduce;
function lclParent: id; message 'lclParent'; reintroduce;
function lclFrame: TRect; message 'lclFrame'; reintroduce;
@ -85,6 +86,7 @@ type
function lclWindowState: Integer; message 'lclWindowState'; reintroduce;
procedure lclInvalidateRect(const r: TRect); message 'lclInvalidateRect:'; reintroduce;
procedure lclInvalidate; message 'lclInvalidate'; reintroduce;
procedure lclRelativePos(var Left, Top: Integer); message 'lclRelativePos::'; reintroduce;
procedure lclLocalToScreen(var X,Y: Integer); message 'lclLocalToScreen::'; reintroduce;
function lclFrame: TRect; message 'lclFrame'; reintroduce;
procedure lclSetFrame(const r: TRect); message 'lclSetFrame:'; reintroduce;
@ -586,7 +588,8 @@ end;
procedure LCLObjectExtension.lclRelativePos(var Left,Top:Integer);
begin
Left := 0;
Top := 0;
end;
procedure LCLObjectExtension.lclLocalToScreen(var X,Y:Integer);
@ -633,7 +636,7 @@ end;
function LCLControlExtension.lclIsEnabled:Boolean;
begin
Result:=IsEnabled;
Result := IsEnabled;
end;
procedure LCLControlExtension.lclSetEnabled(AEnabled:Boolean);
@ -643,7 +646,7 @@ end;
function LCLViewExtension.lclIsVisible:Boolean;
begin
Result:=not isHidden;
Result := not isHidden;
end;
procedure LCLViewExtension.lclInvalidateRect(const r:TRect);
@ -656,6 +659,15 @@ begin
setNeedsDisplay_(True);
end;
procedure LCLViewExtension.lclRelativePos(var Left, Top: Integer);
begin
with frame.origin do
begin
Left := Round(x);
Top := Round(y);
end;
end;
procedure LCLViewExtension.lclLocalToScreen(var X,Y:Integer);
begin
@ -663,26 +675,28 @@ end;
function LCLViewExtension.lclParent:id;
begin
Result:=superView;
Result := superView;
end;
function LCLViewExtension.lclFrame: TRect;
var
v : NSView;
begin
v:=superview;
if Assigned(v)
then NSToLCLRect(frame, v.frame.size.height, Result)
else NSToLCLRect(frame, Result);
v := superview;
if Assigned(v) then
NSToLCLRect(frame, v.frame.size.height, Result)
else
NSToLCLRect(frame, Result);
end;
procedure LCLViewExtension.lclSetFrame(const r:TRect);
procedure LCLViewExtension.lclSetFrame(const r: TRect);
var
ns : NSRect;
begin
if Assigned(superview)
then LCLToNSRect(r, superview.frame.size.height, ns)
else LCLToNSRect(r, ns);
if Assigned(superview) then
LCLToNSRect(r, superview.frame.size.height, ns)
else
LCLToNSRect(r, ns);
setFrame(ns);
end;
@ -704,7 +718,7 @@ end;
function LCLWindowExtension.lclIsVisible:Boolean;
begin
Result:=isVisible;
Result := isVisible;
end;
function LCLWindowExtension.lclWindowState: Integer;
@ -728,54 +742,70 @@ begin
contentView.lclInvalidate;
end;
procedure LCLWindowExtension.lclRelativePos(var Left, Top: Integer);
begin
with frame.origin do
begin
Left := Round(x);
Top := Round(y);
end;
end;
procedure LCLWindowExtension.lclLocalToScreen(var X,Y:Integer);
var
f : NSRect;
f: NSRect;
begin
if Assigned(screen) then begin
f:=frame;
x:=Round(f.origin.x+x);
y:=Round(screen.frame.size.height-f.size.height-f.origin.y);
if Assigned(screen) then
begin
f := frame;
x := Round(f.origin.x + x);
y := Round(screen.frame.size.height - f.size.height - f.origin.y);
end;
end;
function LCLWindowExtension.lclFrame:TRect;
begin
if Assigned(screen)
then NSToLCLRect(frame, screen.frame.size.height, Result)
else NSToLCLRect(frame, Result);
if Assigned(screen) then
NSToLCLRect(frame, screen.frame.size.height, Result)
else
NSToLCLRect(frame, Result);
end;
procedure LCLWindowExtension.lclSetFrame(const r:TRect);
var
ns : NSREct;
ns: NSREct;
begin
if Assigned(screen)
then LCLToNSRect(r, screen.frame.size.height, ns)
else LCLToNSRect(r, ns);
if Assigned(screen) then
LCLToNSRect(r, screen.frame.size.height, ns)
else
LCLToNSRect(r, ns);
setFrame_display(ns, isVisible);
end;
function LCLWindowExtension.lclClientFrame:TRect;
var
wr : NSRect;
b : CGGeometry.CGRect;
wr: NSRect;
b: CGGeometry.CGRect;
begin
wr:=frame;
b:=contentView.frame;
Result.Left:=Round(b.origin.x);
Result.Top:=Round(wr.size.height-b.origin.y);
Result.Right:=Round(b.origin.x+b.size.width);
Result.Bottom:=Round(Result.Top+b.size.height);
wr := frame;
b := contentView.frame;
with Result do
begin
Left := Round(b.origin.x);
Top := Round(wr.size.height - b.origin.y);
Right := Round(b.origin.x + b.size.width);
Bottom := Round(Result.Top + b.size.height);
end;
end;
{ TCocoaListView }
function TCocoaListView.numberOfRowsInTableView(aTableView:NSTableView): NSInteger;
begin
if Assigned(list)
then Result:=list.Count
else Result:=0;
if Assigned(list) then
Result := list.Count
else
Result := 0;
end;
function TCocoaListView.tableView_objectValueForTableColumn_row(tableView: NSTableView;
@ -796,11 +826,7 @@ end;
procedure TCocoaListView.dealloc;
begin
if Assigned(list) then
begin
list.Free;
list:=nil;
end;
FreeAndNil(list);
resultNS.release;
inherited dealloc;
end;

15
lcl/interfaces/cocoa/cocoawinapi.inc
View File

@ -449,7 +449,7 @@ begin
end;
Result := 1;
end else
Result:=0;
Result := 0;
end;
function TCocoaWidgetSet.IsWindowEnabled(Handle: HWND): boolean;
@ -474,17 +474,12 @@ begin
end;
function TCocoaWidgetSet.GetClientRect(handle : HWND; var ARect : TRect) : Boolean;
var
dx, dy: Integer;
begin
Result := Handle <> 0;
if Result then
begin
ARect := NSObject(handle).lclClientFrame;
dx := 0;
dy := 0;
NSObject(Handle).lclLocalToScreen(dx, dy);
MoveRect(ARect, dx, dy);
OffsetRect(ARect, -ARect.Left, -ARect.Top);
end;
end;
@ -548,11 +543,9 @@ end;
function TCocoaWidgetSet.GetWindowRelativePosition(Handle: hwnd; var Left, Top: Integer): boolean;
begin
if Handle<>0 then begin
Result:=True;
Result := Handle <> 0;
if Result then
NSObject(handle).lclRelativePos(Left, Top);
end else
Result:=False;
end;
function TCocoaWidgetSet.GetWindowSize(Handle: hwnd; var Width, Height: Integer): boolean;

42
lcl/interfaces/cocoa/cocoawscommon.pas
View File

@ -160,6 +160,26 @@ var
SizeType: Integer;
begin
NewBounds := Owner.lclFrame;
// send window pos changed
PosMsg.Msg := LM_WINDOWPOSCHANGED;
PosMsg.Result := 0;
New(PosMsg.WindowPos);
try
with PosMsg.WindowPos^ do
begin
hWndInsertAfter := 0;
x := NewBounds.Left;
y := NewBounds.Right;
cx := NewBounds.Right - NewBounds.Left;
cy := NewBounds.Bottom - NewBounds.Top;
flags := 0;
end;
DeliverMessage(Target, PosMsg);
finally
Dispose(PosMsg.WindowPos);
end;
OldBounds := Target.BoundsRect;
Resized :=
@ -171,28 +191,6 @@ begin
ClientResized := False;
// send window pos changed
if Resized or Moved then
begin
PosMsg.Msg := LM_WINDOWPOSCHANGED;
PosMsg.Result := 0;
New(PosMsg.WindowPos);
try
with PosMsg.WindowPos^ do
begin
hWndInsertAfter := 0;
x := NewBounds.Left;
y := NewBounds.Right;
cx := NewBounds.Right - NewBounds.Left;
cy := NewBounds.Bottom - NewBounds.Top;
flags := 0;
end;
DeliverMessage(Target, PosMsg);
finally
Dispose(PosMsg.WindowPos);
end;
end;
// update client rect
if Resized or Target.ClientRectNeedsInterfaceUpdate then
begin