Skip to content

Commit f9927ce

Browse files
author
Hugo Slepicka
committed
FIX: SIP Binding changes to reflect changes from 2.7.0 to master.
1 parent 5778dfe commit f9927ce

File tree

7 files changed

+48
-34
lines changed

7 files changed

+48
-34
lines changed

sip/DockAreaTabBar.sip

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ protected:
2020
void startFloating(const QPoint& Offset);
2121
ads::IFloatingWidget* makeAreaFloating(const QPoint& Offset,
2222
ads::eDragState DragState);
23-
23+
ads::eDragState dragState() const;
24+
2425
public:
2526
CDockAreaTabBar(ads::CDockAreaWidget* parent /TransferThis/);
2627
virtual ~CDockAreaTabBar();

sip/DockManager.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@ signals:
207207
void openingPerspective(const QString& PerspectiveName);
208208
void perspectiveOpened(const QString& PerspectiveName);
209209
void dockAreaCreated(ads::CDockAreaWidget* DockArea);
210+
void dockWidgetAboutToBeRemoved(ads::CDockWidget* DockWidget);
211+
void dockWidgetRemoved(ads::CDockWidget* DockWidget);
210212
};
211213

212214
};

sip/DockWidget.sip

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public:
2828
DockWidgetClosable,
2929
DockWidgetMovable,
3030
DockWidgetFloatable,
31+
DockWidgetDeleteOnClose,
3132
AllDockWidgetFeatures,
3233
NoDockWidgetFeatures
3334
};
@@ -89,6 +90,7 @@ public:
8990
public slots:
9091
void toggleView(bool Open = true);
9192
void setFloating();
93+
void deleteDockWidget();
9294

9395
signals:
9496
void viewToggled(bool Open);

sip/FloatingDockContainer.sip

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ public:
1616
ads::eDragState DragState, QWidget* MouseEventHandler) = 0;
1717

1818
virtual void moveFloating() = 0;
19+
virtual void finishDragging() = 0;
1920
};
2021

2122

@@ -27,11 +28,11 @@ class CFloatingDockContainer : QWidget, ads::IFloatingWidget
2728
%End
2829

2930
protected:
30-
void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
31+
virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
3132
ads::eDragState DragState, QWidget* MouseEventHandler);
3233
void startDragging(const QPoint& DragStartMousePos, const QSize& Size,
3334
QWidget* MouseEventHandler);
34-
void finishDragging();
35+
virtual void finishDragging();
3536
void initFloatingGeometry(const QPoint& DragStartMousePos, const QSize& Size);
3637
void moveFloating();
3738
bool restoreState(ads::CDockingStateReader& Stream, bool Testing);

sip/FloatingDragPreview.sip

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
%Import QtWidgets/QtWidgetsmod.sip
2+
3+
%If (Qt_5_0_0 -)
4+
5+
namespace ads
6+
{
7+
8+
class CFloatingDragPreview : QWidget, ads::IFloatingWidget
9+
{
10+
11+
%TypeHeaderCode
12+
#include <FloatingDragPreview.h>
13+
%End
14+
15+
16+
public:
17+
CFloatingDragPreview(ads::CDockWidget* Content /TransferThis/ );
18+
CFloatingDragPreview(ads::CDockAreaWidget* Content /TransferThis/ );
19+
20+
virtual ~CFloatingDragPreview();
21+
22+
virtual bool eventFilter(QObject* watched, QEvent* event);
23+
24+
virtual void startFloating(const QPoint& DragStartMousePos, const QSize& Size,
25+
ads::eDragState DragState, QWidget* MouseEventHandler);
26+
27+
virtual void moveFloating();
28+
29+
virtual void finishDragging();
30+
31+
signals:
32+
void draggingCanceled();
33+
34+
};
35+
36+
};
37+
38+
%End

sip/FloatingOverlay.sip

Lines changed: 0 additions & 30 deletions
This file was deleted.

sip/ads.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
%Include DockWidgetTab.sip
1717
%Include ElidingLabel.sip
1818
%Include FloatingDockContainer.sip
19-
%Include FloatingOverlay.sip
19+
%Include FloatingDragPreview.sip
2020
%Include IconProvider.sip
2121
%If (Linux)
2222
%Include linux/FloatingWidgetTitleBar.sip

0 commit comments

Comments
 (0)