mirrors/Qt-Advanced-Docking-System
1
0
Fork 0
mirror of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git synced 2024-11-15 13:15:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

FIX: SIP Binding changes to reflect changes from 2.7.0 to master.

Browse Source
This commit is contained in:
Hugo Slepicka 2019-12-18 15:17:28 -08:00
parent 5778dfe929
commit f9927cef29
7 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sip/DockAreaTabBar.sip
View File

@ -20,7 +20,8 @@ protected:
void startFloating(const QPoint& Offset);
ads::IFloatingWidget* makeAreaFloating(const QPoint& Offset,
ads::eDragState DragState);
ads::eDragState dragState() const;
public:
CDockAreaTabBar(ads::CDockAreaWidget* parent /TransferThis/);
virtual ~CDockAreaTabBar();

2
sip/DockManager.sip
View File

@ -207,6 +207,8 @@ signals:
void openingPerspective(const QString& PerspectiveName);
void perspectiveOpened(const QString& PerspectiveName);
void dockAreaCreated(ads::CDockAreaWidget* DockArea);
void dockWidgetAboutToBeRemoved(ads::CDockWidget* DockWidget);
void dockWidgetRemoved(ads::CDockWidget* DockWidget);
};
};

2
sip/DockWidget.sip
View File

@ -28,6 +28,7 @@ public:
DockWidgetClosable,
DockWidgetMovable,
DockWidgetFloatable,
DockWidgetDeleteOnClose,
AllDockWidgetFeatures,
NoDockWidgetFeatures
};
@ -89,6 +90,7 @@ public:
public slots:
void toggleView(bool Open = true);
void setFloating();
void deleteDockWidget();
signals:
void viewToggled(bool Open);

5
sip/FloatingDockContainer.sip
View File

@ -16,6 +16,7 @@ public:
ads::eDragState DragState, QWidget* MouseEventHandler) = 0;
virtual void moveFloating() = 0;
virtual void finishDragging() = 0;
};
@ -27,11 +28,11 @@ class CFloatingDockContainer : QWidget, ads::IFloatingWidget
%End
protected:
void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
ads::eDragState DragState, QWidget* MouseEventHandler);
void startDragging(const QPoint& DragStartMousePos, const QSize& Size,
QWidget* MouseEventHandler);
void finishDragging();
virtual void finishDragging();
void initFloatingGeometry(const QPoint& DragStartMousePos, const QSize& Size);
void moveFloating();
bool restoreState(ads::CDockingStateReader& Stream, bool Testing);

38
sip/FloatingDragPreview.sip Normal file
View File

@ -0,0 +1,38 @@
%Import QtWidgets/QtWidgetsmod.sip
%If (Qt_5_0_0 -)
namespace ads
{
class CFloatingDragPreview : QWidget, ads::IFloatingWidget
{
%TypeHeaderCode
#include <FloatingDragPreview.h>
%End
public:
CFloatingDragPreview(ads::CDockWidget* Content /TransferThis/ );
CFloatingDragPreview(ads::CDockAreaWidget* Content /TransferThis/ );
virtual ~CFloatingDragPreview();
virtual bool eventFilter(QObject* watched, QEvent* event);
virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
ads::eDragState DragState, QWidget* MouseEventHandler);
virtual void moveFloating();
virtual void finishDragging();
signals:
void draggingCanceled();
};
};
%End

30
sip/FloatingOverlay.sip
View File

@ -1,30 +0,0 @@
%Import QtWidgets/QtWidgetsmod.sip
%If (Qt_5_0_0 -)
namespace ads
{
class CFloatingOverlay : QWidget, ads::IFloatingWidget
{
%TypeHeaderCode
#include <FloatingOverlay.h>
%End
public:
CFloatingOverlay(ads::CDockWidget* Content /TransferThis/ );
CFloatingOverlay(ads::CDockAreaWidget* Content /TransferThis/ );
virtual ~CFloatingOverlay();
virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
ads::eDragState DragState, QWidget* MouseEventHandler);
virtual void moveFloating();
};
};
%End

2
sip/ads.sip
View File

@ -16,7 +16,7 @@
%Include DockWidgetTab.sip
%Include ElidingLabel.sip
%Include FloatingDockContainer.sip
%Include FloatingOverlay.sip
%Include FloatingDragPreview.sip
%Include IconProvider.sip
%If (Linux)
%Include linux/FloatingWidgetTitleBar.sip