diff --git a/src/AutoHideDockContainer.h b/src/AutoHideDockContainer.h index 2c0538e..3a6b8c7 100644 --- a/src/AutoHideDockContainer.h +++ b/src/AutoHideDockContainer.h @@ -53,7 +53,7 @@ class CDockingStateReader; class ADS_EXPORT CAutoHideDockContainer : public QFrame { Q_OBJECT - Q_PROPERTY(ads::SideBarLocation sideTabBarArea READ sideTabBarArea) + Q_PROPERTY(int sideTabBarArea READ sideTabBarArea) private: AutoHideDockContainerPrivate* d; ///< private data (pimpl) friend struct AutoHideDockContainerPrivate; diff --git a/src/DockWidgetSideTab.cpp b/src/DockWidgetSideTab.cpp index 3eb2845..19cae32 100644 --- a/src/DockWidgetSideTab.cpp +++ b/src/DockWidgetSideTab.cpp @@ -47,7 +47,7 @@ struct DockWidgetSideTabPrivate { CDockWidgetSideTab* _this; CDockWidget* DockWidget; - CSideTabBar* SideTabBar; + CSideTabBar* SideTabBar = nullptr; Qt::Orientation Orientation{Qt::Vertical}; /** @@ -106,7 +106,7 @@ CDockWidgetSideTab::~CDockWidgetSideTab() //============================================================================ void CDockWidgetSideTab::updateStyle() { - internal::repolishStyle(this, internal::RepolishDirectChildren); + internal::repolishStyle(this, internal::RepolishDirectChildren); update(); } @@ -114,10 +114,10 @@ void CDockWidgetSideTab::updateStyle() //============================================================================ SideBarLocation CDockWidgetSideTab::sideTabBarArea() const { - auto dockAreaWidget = d->DockWidget->dockAreaWidget(); - if (dockAreaWidget && dockAreaWidget->isAutoHide()) + if (d->SideTabBar) { - return dockAreaWidget->autoHideDockContainer()->sideTabBarArea(); + qDebug() << "CDockWidgetSideTab::sideTabBarArea() " << d->SideTabBar->sideTabBarArea(); + return d->SideTabBar->sideTabBarArea(); } return Left; diff --git a/src/DockWidgetSideTab.h b/src/DockWidgetSideTab.h index f01e8b8..4da3c75 100644 --- a/src/DockWidgetSideTab.h +++ b/src/DockWidgetSideTab.h @@ -50,7 +50,7 @@ class ADS_EXPORT CDockWidgetSideTab : public CPushButton { Q_OBJECT - Q_PROPERTY(ads::SideBarLocation sideTabBarArea READ sideTabBarArea) + Q_PROPERTY(int sideTabBarArea READ sideTabBarArea) Q_PROPERTY(Qt::Orientation orientation READ orientation) Q_PROPERTY(bool activeTab READ isActiveTab) diff --git a/src/ResizeHandle.h b/src/ResizeHandle.h index 81264b1..1b5af32 100644 --- a/src/ResizeHandle.h +++ b/src/ResizeHandle.h @@ -24,7 +24,7 @@ class ADS_EXPORT CResizeHandle : public QFrame { Q_OBJECT Q_DISABLE_COPY(CResizeHandle) - Q_PROPERTY(bool opaqueResize READ opaqueResize WRITE setOpaqueResize) + Q_PROPERTY(bool opaqueResize READ opaqueResize WRITE setOpaqueResize) private: ResizeHandlePrivate* d; ///< private data (pimpl) friend struct ResizeHandlePrivate; diff --git a/src/SideTabBar.cpp b/src/SideTabBar.cpp index cf380e4..d996ede 100644 --- a/src/SideTabBar.cpp +++ b/src/SideTabBar.cpp @@ -128,10 +128,10 @@ CSideTabBar::~CSideTabBar() //============================================================================ void CSideTabBar::insertSideTab(int Index, CDockWidgetSideTab* SideTab) { - SideTab->updateOrientationForArea(d->SideTabArea); SideTab->installEventFilter(this); - d->TabsLayout->insertWidget(Index, SideTab); SideTab->setSideTabBar(this); + SideTab->updateOrientationForArea(d->SideTabArea); + d->TabsLayout->insertWidget(Index, SideTab); show(); } diff --git a/src/SideTabBar.h b/src/SideTabBar.h index eb08973..4ba757a 100644 --- a/src/SideTabBar.h +++ b/src/SideTabBar.h @@ -50,7 +50,7 @@ class CAutoHideDockContainer; class ADS_EXPORT CSideTabBar : public QFrame { Q_OBJECT - Q_PROPERTY(ads::SideBarLocation sideTabBarArea READ sideTabBarArea) + Q_PROPERTY(int sideTabBarArea READ sideTabBarArea) Q_PROPERTY(Qt::Orientation orientation READ orientation) private: