From b0287567ee397194cb9029702be80ee3dd6f191e Mon Sep 17 00:00:00 2001 From: freq Date: Fri, 20 Dec 2013 15:55:11 +0000 Subject: [PATCH] Fix unassigned Rect value in Cocoa window creation and changed to constant in setlevel call during Cocoa hint window creation git-svn-id: trunk@43570 - --- lcl/interfaces/cocoa/cocoawsforms.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lcl/interfaces/cocoa/cocoawsforms.pp b/lcl/interfaces/cocoa/cocoawsforms.pp index e9641af1c3..2cbf3ac151 100644 --- a/lcl/interfaces/cocoa/cocoawsforms.pp +++ b/lcl/interfaces/cocoa/cocoawsforms.pp @@ -196,8 +196,7 @@ begin R := CreateParamsToNSRect(AParams); win := TCocoaPanel(win.initWithContentRect_styleMask_backing_defer(R, WinMask, NSBackingStoreBuffered, False)); win.enableCursorRects; - // TODO: replace numeric constant with Cocoa constant - win.setLevel(8); + win.setLevel(FormStyleToWindowLevel[fsSystemStayOnTop]); TCocoaPanel(win).callback := TLCLWindowCallback.Create(win, AWinControl); win.setDelegate(win); win.setAcceptsMouseMovedEvents(True); @@ -332,6 +331,9 @@ begin Exit; end; + R := CreateParamsToNSRect(AParams); + R.origin.x := 0; + R.origin.y := 0; cnt := TCocoaWindowContent.alloc.initWithFrame(R); if (AParams.Style and WS_CHILD) = 0 then @@ -348,8 +350,6 @@ begin ns.release; win.setAcceptsMouseMovedEvents(True); - R.origin.x := 0; - R.origin.y := 0; cnt.callback := TCocoaWindow(win).callback; win.setContentView(cnt);