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

qt: implement close button support for TNotebook for qt 4.5

Browse Source 
git-svn-id: trunk@19900 -
This commit is contained in:
paul 2009-05-10 06:43:06 +00:00
parent dcf220b4e4
commit 74c011bf82
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/interfaces/qt/qtdefines.inc
View File

@ -4,4 +4,4 @@
{$IFDEF MSWindows}
{$define USE_QT_45}
{$ENDIF}
{$ENDIF}

27
lcl/interfaces/qt/qtwidgets.pas
View File

@ -657,6 +657,7 @@ type
TQtTabWidget = class(TQtWidget)
private
FCurrentChangedHook: QTabWidget_hookH;
FCloseRequestedHook: QTabWidget_hookH;
FTabBar: TQtTabBar;
FStackWidget: QWidgetH;
function getShowTabs: Boolean;
@ -672,6 +673,7 @@ type
function EventFilter(Sender: QObjectH; Event: QEventH): Boolean; cdecl; override;
procedure SignalCurrentChanged(Index: Integer); cdecl;
procedure SignalCloseRequested(Index: Integer); cdecl;
public
function indexOf(const AWidget: QWidgetH): integer;
function insertTab(index: Integer; page: QWidgetH; p2: WideString): Integer; overload;
@ -685,6 +687,7 @@ type
procedure setCurrentWidget(APage: TQtWidget);
procedure setTabPosition(ATabPosition: QTabWidgetTabPosition);
procedure setTabText(index: Integer; p2: WideString);
procedure setTabsClosable(AValue: Boolean);
function tabAt(APoint: TPoint): Integer;
property ShowTabs: Boolean read getShowTabs write setShowTabs;
@ -5831,11 +5834,18 @@ begin
FCurrentChangedHook := QTabWidget_hook_create(Widget);
QTabWidget_currentChanged_Event(Method) := @SignalCurrentChanged;
QTabWidget_hook_hook_currentChanged(FCurrentChangedHook, Method);
FCloseRequestedHook := QTabWidget_hook_create(Widget);
{$ifdef USE_QT_45}
QTabWidget_tabCloseRequested_Event(Method) := @SignalCloseRequested;
QTabWidget_hook_hook_tabCloseRequested(FCloseRequestedHook, Method);
{$endif}
end;
procedure TQtTabWidget.DetachEvents;
begin
QTabWidget_hook_destroy(FCurrentChangedHook);
QTabWidget_hook_destroy(FCloseRequestedHook);
inherited DetachEvents;
end;
@ -5949,6 +5959,16 @@ begin
DeliverMessage(Msg);
end;
procedure TQtTabWidget.SignalCloseRequested(Index: Integer); cdecl;
var
APage: TCustomPage;
begin
APage := TCustomNotebook(LCLObject).Page[GetLCLPageIndex(Index)];
if not APage.HandleAllocated then
Exit;
TCustomNoteBook(LCLObject).DoCloseTabClicked(APage);
end;
function TQtTabWidget.indexOf(const AWidget: QWidgetH): integer;
begin
Result := QTabWidget_indexOf(QTabWidgetH(Widget), AWidget);
@ -5959,6 +5979,13 @@ begin
QTabWidget_setTabText(QTabWidgetH(Widget), index, @p2);
end;
procedure TQtTabWidget.setTabsClosable(AValue: Boolean);
begin
{$ifdef USE_QT_45}
QTabWidget_setTabsClosable(QTabWidgetH(Widget), AValue);
{$endif}
end;
function TQtTabWidget.tabAt(APoint: TPoint): Integer;
var
AQtPoint: TQtPoint;

5
lcl/interfaces/qt/qtwsextctrls.pp
View File

@ -276,6 +276,9 @@ begin
end;
end;
end;
with TCustomNoteBook(ACustomPage.Parent) do
TQtTabWidget(Handle).setTabsClosable(nboShowCloseButtons in Options);
end;
{ TQtWSCustomNotebook }
@ -295,7 +298,7 @@ begin
WriteLn('TQtWSCustomNotebook.CreateHandle');
{$endif}
QtTabWidget := TQtTabWidget.Create(AWinControl, AParams);
QtTabWidget.SetTabPosition(QTabWidgetTabPositionMap[TCustomNoteBook(AWinControl).TabPosition]);
QtTabWidget.setTabPosition(QTabWidgetTabPositionMap[TCustomNoteBook(AWinControl).TabPosition]);
QtTabWidget.AttachEvents;
// Returns the Handle