Scarfski/Qt-Advanced-Docking-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed container removal from MainCOntainerWidget

Browse Source
This commit is contained in:
Uwe Kindler
2017-02-10 21:23:14 +01:00
parent a4de5c5560
commit 2bf1a51627
5 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
AdvancedDockingSystem/include/ads/FloatingWidget.h
View File

@@ -80,6 +80,8 @@ protected:
virtual void changeEvent(QEvent *event) override;
virtual void moveEvent(QMoveEvent *event) override;
virtual bool event(QEvent *e);
void titleMouseReleaseEvent();
virtual bool eventFilter(QObject *watched, QEvent *event) override;
void updateDropOverlays(const QPoint& GlobalPos);
private slots:
@@ -91,6 +93,7 @@ private:
SectionTitleWidget* _titleWidget;
SectionContentWidget* _contentWidget;
CContainerWidget* m_ContainerWidget;
CContainerWidget* m_DropContainer;
bool m_DraggingActive = false;
unsigned int m_zOrderIndex = 0;
static unsigned int zOrderCounter;

4
AdvancedDockingSystem/include/ads/MainContainerWidget.h
View File

@@ -40,6 +40,7 @@ class ADS_EXPORT_API MainContainerWidget : public CContainerWidget
friend class SectionTitleWidget;
friend class ContainerWidgetPrivate;
friend class CFloatingTitleWidget;
friend class CContainerWidget;
public:
explicit MainContainerWidget(QWidget *parent = nullptr);
@@ -151,7 +152,6 @@ private:
FloatingWidget* startFloating(SectionWidget* sectionwidget, int ContentUid, const QPoint& TargetPos);
void hideContainerOverlay();
void moveFloatingWidget(const QPoint& TargetPos);
void dropFloatingWidget(FloatingWidget* FloatingWidget, const QPoint& TargetPos);
private slots:
void onActiveTabChanged();
@@ -175,7 +175,6 @@ signals:
void sectionContentVisibilityChanged(const SectionContent::RefPtr& sc, bool visible);
private:
QList<SectionWidget*> m_Sections;
QList<FloatingWidget*> m_Floatings;
QList<CContainerWidget*> m_Containers;
QHash<int, HiddenSectionItem> m_HiddenSectionContents;
@@ -189,5 +188,6 @@ private:
QPointer<DropOverlay> m_SectionDropOverlay;
};
ADS_NAMESPACE_END
#endif