diff --git a/src/controllers/DockWidget.cpp b/src/controllers/DockWidget.cpp index 20d66827..74030ceb 100644 --- a/src/controllers/DockWidget.cpp +++ b/src/controllers/DockWidget.cpp @@ -387,7 +387,6 @@ QStringList DockWidget::affinities() const void DockWidget::show() { - // TODOm2: show wont be called. move to view instead. if (view()->isRootView() && (d->m_lastPosition->wasFloating() || !d->m_lastPosition->isValid())) { // Create the FloatingWindow already, instead of waiting for the show event. // This reduces flickering on some platforms @@ -665,7 +664,7 @@ void DockWidget::Private::toggle(bool enabled) } else { // The most common case. The dock widget is not in the sidebar. just close or open it. if (enabled) { - show(); + q->show(); } else { q->view()->close(); } @@ -813,12 +812,6 @@ void DockWidget::Private::saveTabIndex() m_lastPosition->saveTabIndex(currentTabIndex(), q->isFloating()); } -void DockWidget::Private::show() -{ - // Only show for now - q->show(); -} - void DockWidget::onParentChanged() { Q_EMIT parentViewChanged(); diff --git a/src/controllers/DockWidget_p.h b/src/controllers/DockWidget_p.h index ff227b29..f4f95a73 100644 --- a/src/controllers/DockWidget_p.h +++ b/src/controllers/DockWidget_p.h @@ -123,7 +123,6 @@ public: void updateFloatAction(); void onDockWidgetShown(); void onDockWidgetHidden(); - void show(); void close(); bool restoreToPreviousPosition(); void maybeRestoreToPreviousPosition(); diff --git a/src/qtwidgets/views/DockWidget_qtwidgets.h b/src/qtwidgets/views/DockWidget_qtwidgets.h index c7848307..4b871c8d 100644 --- a/src/qtwidgets/views/DockWidget_qtwidgets.h +++ b/src/qtwidgets/views/DockWidget_qtwidgets.h @@ -70,6 +70,8 @@ public: */ void setWidget(QWidget *widget); + // TODOm2: Add show to the views + protected: void init() override; bool event(QEvent *) override;