philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Port DockRegistry away from QGuiApplication::focusObjectChanged

Browse Source 
Use the Qt agnostic way, from Platform.h
This commit is contained in:
Sergio Martins
2022-04-07 00:24:06 +01:00
parent 9f4cb1a13e
commit be150c1c52
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/private/DockRegistry.cpp
View File

@@ -51,15 +51,14 @@ DockRegistry::DockRegistry(QObject *parent)
: QObject(parent)
{
qApp->installEventFilter(this);
connect(qApp, &QGuiApplication::focusObjectChanged,
this, &DockRegistry::onFocusObjectChanged);
m_connection = Platform::instance()->focusedViewChanged.connect(&DockRegistry::onFocusedViewChanged, this);
initKDDockWidgetResources();
}
DockRegistry::~DockRegistry()
{
m_connection.disconnect();
}
void DockRegistry::maybeDelete()
@@ -68,11 +67,11 @@ void DockRegistry::maybeDelete()
delete this;
}
void DockRegistry::onFocusObjectChanged(QObject *obj)
void DockRegistry::onFocusedViewChanged(std::shared_ptr<ViewWrapper> view)
{
auto p = qobject_cast<WidgetType *>(obj);
while (p) {
if (auto frame = Views::ViewWrapper_qtwidgets(qobject_cast<QWidget *>(p)).asFrameController()) {
auto p = view;
while (p && !p->isNull()) {
if (auto frame = p->asFrameController()) {
// Special case: The focused widget is inside the frame but not inside the dockwidget.
// For example, it's a line edit in the QTabBar. We still need to send the signal for
// the current dw in the tab group
@@ -83,11 +82,11 @@ void DockRegistry::onFocusObjectChanged(QObject *obj)
return;
}
if (auto dwView = qobject_cast<Views::DockWidget_qtwidgets *>(p)) {
DockRegistry::self()->setFocusedDockWidget(dwView->dockWidget());
if (auto dw = p->asDockWidgetController()) {
DockRegistry::self()->setFocusedDockWidget(dw);
return;
}
p = p->parentWidget();
p = p->parentView();
}
setFocusedDockWidget(nullptr);

5
src/private/DockRegistry_p.h
View File

@@ -20,6 +20,8 @@
#include <QObject>
#include <QPointer>
#include "kdbindings/signal.h"
/**
* DockRegistry is a singleton that knows about all DockWidgets.
* It's used so we can restore layouts.
@@ -245,7 +247,7 @@ private:
friend class FocusScope;
explicit DockRegistry(QObject *parent = nullptr);
bool onDockWidgetPressed(Controllers::DockWidget *dw, QMouseEvent *);
void onFocusObjectChanged(QObject *obj);
void onFocusedViewChanged(std::shared_ptr<ViewWrapper> view);
void maybeDelete();
void setFocusedDockWidget(Controllers::DockWidget *);
@@ -256,6 +258,7 @@ private:
QVector<Controllers::FloatingWindow *> m_floatingWindows;
QVector<LayoutWidget *> m_layouts;
QPointer<Controllers::DockWidget> m_focusedDockWidget;
KDBindings::ConnectionHandle m_connection;
///@brief Dock widget id remapping, used by LayoutSaver
///