diff --git a/src/private/TitleBar.cpp b/src/private/TitleBar.cpp index 037c93fe..62a68ae2 100644 --- a/src/private/TitleBar.cpp +++ b/src/private/TitleBar.cpp @@ -59,7 +59,7 @@ TitleBar::TitleBar(FloatingWindow *parent) init(); } -TitleBar::TitleBar(QWidget *parent) +TitleBar::TitleBar(WidgetType *parent) : QWidgetAdapter(parent) , Draggable(this, /*enabled=*/false) // We don't allow dragging generic windows at this time , m_frame(nullptr) @@ -337,9 +337,11 @@ bool TitleBar::isFocused() const return m_frame->isFocused(); else if (m_floatingWindow) return m_floatingWindow->isActiveWindow(); +#ifdef KDDOCKWIDGETS_QTWIDGETS + // Remove ifdef in 2.0 branch. else if (m_genericWidget) return m_genericWidget->isActiveWindow(); - +#endif return false; } diff --git a/src/private/TitleBar_p.h b/src/private/TitleBar_p.h index 313ebfbf..f81f6882 100644 --- a/src/private/TitleBar_p.h +++ b/src/private/TitleBar_p.h @@ -53,7 +53,7 @@ public: /// Allows TitleBar to be used in a non-dockwidget application, for example on a frameless QMessageBox on EGLFS /// Just so we can reuse the existing styling - explicit TitleBar(QWidget *parent); + explicit TitleBar(WidgetType *parent); ~TitleBar() override; @@ -190,7 +190,7 @@ private: Frame *const m_frame; FloatingWindow *const m_floatingWindow; - QWidget *const m_genericWidget; + WidgetType *const m_genericWidget; const bool m_supportsAutoHide; bool m_closeButtonEnabled = true; bool m_floatButtonVisible = true;