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

Add a m_thisWeakPtr member to Views

Browse Source 
Allows to promote back to shared pointer
This commit is contained in:
Sergio Martins
2022-07-02 20:12:33 +01:00
parent ba71ad7407
commit 7d21516f6d
14 changed files with 83 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qtwidgets/Platform_qtwidgets.cpp
View File

@@ -60,13 +60,11 @@ public:
if (auto w = qobject_cast<QWidget *>(o)) {
if (w->isWindow()) {
if (ev->type() == QEvent::WindowActivate) {
auto wrapper = new Views::ViewWrapper_qtwidgets(w);
Platform::instance()->d->windowActivated.emit(std::shared_ptr<View>(wrapper));
Platform::instance()->d->windowActivated.emit(Views::ViewWrapper_qtwidgets::create(w));
}
if (ev->type() == QEvent::WindowDeactivate) {
auto wrapper = new Views::ViewWrapper_qtwidgets(w);
Platform::instance()->d->windowDeactivated.emit(std::shared_ptr<View>(wrapper));
Platform::instance()->d->windowDeactivated.emit(Views::ViewWrapper_qtwidgets::create(w));
}
}
}
@@ -99,8 +97,7 @@ void Platform_qtwidgets::init()
#endif
qGuiApp->connect(qApp, &QGuiApplication::focusObjectChanged, qApp, [this](QObject *obj) {
ViewWrapper *wrapper = obj ? new Views::ViewWrapper_qtwidgets(obj) : nullptr;
d->focusedViewChanged.emit(std::shared_ptr<View>(wrapper));
d->focusedViewChanged.emit(Views::ViewWrapper_qtwidgets::create(obj));
});
}
@@ -121,12 +118,7 @@ bool Platform_qtwidgets::hasActivePopup() const
std::shared_ptr<View> Platform_qtwidgets::qobjectAsView(QObject *obj) const
{
if (auto w = qobject_cast<QWidget *>(obj)) {
ViewWrapper *wrapper = new Views::ViewWrapper_qtwidgets(w);
return std::shared_ptr<View>(wrapper);
}
return nullptr;
return Views::ViewWrapper_qtwidgets::create(obj);
}
std::shared_ptr<Window> Platform_qtwidgets::windowFromQWindow(QWindow *qwindow) const