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

cocoa: Fixes the display of controls in tabs

Browse Source 
git-svn-id: trunk@44864 -
This commit is contained in:
sekelsenmat 2014-04-30 21:57:35 +00:00
parent 580048e97c
commit 594e1f2069
3 changed files with 96 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ unit CocoaPrivate;
{$mode objfpc}{$H+}
{$modeswitch objectivec1}
{$interfaces corba}
{.$DEFINE COCOA_DEBUG_SETBOUNDS}
interface
@ -27,6 +28,7 @@ uses
// Libs
MacOSAll, CocoaAll, CocoaUtils, CocoaGDIObjects,
// LCL
LMessages, LCLMessageGlue,
LCLType, LCLProc, Controls, ComCtrls;
type
@ -530,12 +532,22 @@ type
LCLPage: TCustomPage;
function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override;
function lclFrame: TRect; override;
function lclClientFrame: TRect; override;
end;
TCocoaTabControl = objcclass(NSTabView)
{ TCocoaTabControl }
TCocoaTabControl = objcclass(NSTabView, NSTabViewDelegateProtocol)
LCLPageControl: TCustomTabControl;
callback: ICommonCallback;
function lclGetCallback: ICommonCallback; override;
procedure lclClearCallback; override;
// NSTabViewDelegateProtocol
function tabView_shouldSelectTabViewItem(tabView: NSTabView; tabViewItem: NSTabViewItem): Boolean; message 'tabView:shouldSelectTabViewItem:';
procedure tabView_willSelectTabViewItem(tabView: NSTabView; tabViewItem: NSTabViewItem); message 'tabView:willSelectTabViewItem:';
procedure tabView_didSelectTabViewItem(tabView: NSTabView; tabViewItem: NSTabViewItem); message 'tabView:didSelectTabViewItem:';
procedure tabViewDidChangeNumberOfTabViewItems(TabView: NSTabView); message 'tabViewDidChangeNumberOfTabViewItems:';
end;
TCocoaTabPageView = objcclass(NSView)
@ -1752,10 +1764,11 @@ begin
end
else
pstr := '';
WriteLn(Format('[LCLViewExtension.lclInitWithCreateParams] Class=%s Caption=%s ParentClass=%s ParentClassView=%s rect=%d %d %d %d',
WriteLn(Format('[LCLViewExtension.lclInitWithCreateParams] Class=%s Caption=%s ParentClass=%s ParentClassView=%s rect=%d %d %d %d Visible=%d',
[NSStringToString(Self.className), AParams.Caption,
NSStringToString(NSObject(AParams.WndParent).className), pstr,
Round(ns.Origin.x), Round(ns.Origin.y), Round(ns.size.width), Round(ns.size.height)]));
Round(ns.Origin.x), Round(ns.Origin.y), Round(ns.size.width), Round(ns.size.height),
AParams.Style and WS_VISIBLE]));
{$ENDIF}
Result := initWithFrame(ns);
@ -1777,6 +1790,10 @@ end;
procedure LCLViewExtension.lclSetVisible(AVisible: Boolean);
begin
setHidden(not AVisible);
{$IFDEF COCOA_DEBUG_SETBOUNDS}
WriteLn(Format('LCLViewExtension.lclSetVisible: %s AVisible=%d',
[NSStringToString(Self.ClassName), Integer(AVisible)]));
{$ENDIF}
end;
function LCLViewExtension.lclIsPainting: Boolean;
@ -1864,7 +1881,9 @@ var
begin
svHeight := GetNSViewSuperViewHeight(Self);
if Assigned(superview) then
begin
LCLToNSRect(r, svHeight, ns)
end
else
ns := RectToNSRect(r);
{$IFDEF COCOA_DEBUG_SETBOUNDS}
@ -2189,6 +2208,20 @@ begin
callback := nil;
end;
function TCocoaTabPage.lclFrame: TRect;
var
svh: CGFloat;
begin
svh := tabView.frame.size.height;
NSToLCLRect(tabView.contentRect, svh, Result);
//WriteLn('[TCocoaTabPage.lclFrame] '+dbgs(Result)+' '+NSStringToString(Self.label_));
end;
function TCocoaTabPage.lclClientFrame: TRect;
begin
Result := lclFrame();
end;
{ TCocoaTabControl }
function TCocoaTabControl.lclGetCallback: ICommonCallback;
@ -2201,6 +2234,58 @@ begin
callback := nil;
end;
function TCocoaTabControl.tabView_shouldSelectTabViewItem(tabView: NSTabView;
tabViewItem: NSTabViewItem): Boolean;
begin
end;
procedure TCocoaTabControl.tabView_willSelectTabViewItem(tabView: NSTabView;
tabViewItem: NSTabViewItem);
var
Msg: TLMNotify;
Hdr: TNmHdr;
begin
if LCLPageControl = nil then Exit;
FillChar(Msg, SizeOf(Msg), 0);
Msg.Msg := LM_NOTIFY;
FillChar(Hdr, SizeOf(Hdr), 0);
Hdr.hwndFrom := HWND(tabview);
Hdr.Code := TCN_SELCHANGING;
Hdr.idFrom := PtrUInt(tabview.indexOfTabViewItem(tabViewItem));
Msg.NMHdr := @Hdr;
Msg.Result := 0;
LCLMessageGlue.DeliverMessage(LCLPageControl, Msg);
end;
procedure TCocoaTabControl.tabView_didSelectTabViewItem(tabView: NSTabView;
tabViewItem: NSTabViewItem);
var
Msg: TLMNotify;
Hdr: TNmHdr;
begin
if LCLPageControl = nil then Exit;
FillChar(Msg, SizeOf(Msg), 0);
Msg.Msg := LM_NOTIFY;
FillChar(Hdr, SizeOf(Hdr), 0);
Hdr.hwndFrom := HWND(tabview);
Hdr.Code := TCN_SELCHANGE;
Hdr.idFrom := PtrUInt(tabview.indexOfTabViewItem(tabViewItem));
Msg.NMHdr := @Hdr;
Msg.Result := 0;
LCLMessageGlue.DeliverMessage(LCLPageControl, Msg);
end;
procedure TCocoaTabControl.tabViewDidChangeNumberOfTabViewItems(
TabView: NSTabView);
begin
end;
{ TCocoaTableListView }
function TCocoaTableListView.lclIsHandle: Boolean;

2
lcl/interfaces/cocoa/cocoawscomctrls.pas
View File

@ -249,6 +249,8 @@ begin
if Result <> 0 then
begin
lControl.callback := TLCLCommonCallback.Create(lControl, AWinControl);
lControl.LCLPageControl := TCustomTabControl(AWinControl);
lControl.setDelegate(lControl);
end;
end;

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

@ -2,6 +2,7 @@ unit CocoaWSCommon;
{$mode objfpc}{$H+}
{$modeswitch objectivec1}
{.$DEFINE COCOA_DEBUG_SETBOUNDS}
interface
@ -1269,14 +1270,16 @@ begin
end;
class procedure TCocoaWSWinControl.ShowHide(const AWinControl: TWinControl);
var pool: NSAutoreleasePool; // called outside apploop on startup - therefore has to be enframed by pool
var
pool: NSAutoreleasePool; // called outside apploop on startup - therefore has to be enframed by pool
begin
//WriteLn(Format('[TCocoaWSWinControl.ShowHide] AWinControl=%s %s', [AWinControl.Name, AWinControl.ClassName]));
if AWinControl.HandleAllocated then
begin
begin
pool := NSAutoreleasePool.alloc.init;
NSObject(AWinControl.Handle).lclSetVisible(AWinControl.HandleObjectShouldBeVisible);
pool.release;
end;
end;
end;
class procedure TCocoaWSWinControl.Invalidate(const AWinControl: TWinControl);