poz/quickshell
1
0
Fork 0
forked from quickshell/quickshell
Code Pull requests Activity

refactor: move reload function to QtShellGlobal

Browse source
This commit is contained in:
outfoxxed 2024-02-04 05:17:18 -08:00
parent 7a18ce8a55
commit 767500b466
Signed by untrusted user: outfoxxed
GPG key ID: 4C88A185FB89301E
4 changed files with 17 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/cpp/qmlglobal.cpp
View file

@ -3,12 +3,16 @@
#include <qcontainerfwd.h>
#include <qcoreapplication.h>
#include <qguiapplication.h>
#include <qlogging.h>
#include <qobject.h>
#include <qqmlcontext.h>
#include <qqmlengine.h>
#include <qqmllist.h>
#include <qtmetamacros.h>
#include <qtypes.h>
#include "qmlscreen.hpp"
#include "rootwrapper.hpp"
QtShellGlobal::QtShellGlobal(QObject* parent): QObject(parent) {
auto* app = QCoreApplication::instance();
@ -42,6 +46,18 @@ QQmlListProperty<QtShellScreenInfo> QtShellGlobal::screens() {
);
}
void QtShellGlobal::reload(bool hard) {
auto* rootobj = QQmlEngine::contextForObject(this)->engine()->parent();
auto* root = qobject_cast<RootWrapper*>(rootobj);
if (root == nullptr) {
qWarning() << "cannot find RootWrapper for reload, ignoring request";
return;
}
root->reloadGraph(hard);
}
void QtShellGlobal::updateScreens() {
auto screens = QGuiApplication::screens();
this->mScreens.resize(screens.size());

1
src/cpp/qmlglobal.hpp
View file

@ -24,6 +24,7 @@ signals:
void screensChanged();
public slots:
void reload(bool hard);
void updateScreens();
private:

17
src/cpp/shell.cpp
View file

@ -1,26 +1,9 @@
#include "shell.hpp"
#include <utility>
#include <qlogging.h>
#include <qobject.h>
#include <qqmlcontext.h>
#include <qqmlengine.h>
#include <qqmllist.h>
#include "rootwrapper.hpp"
void QtShell::reload(bool hard) {
auto* rootobj = QQmlEngine::contextForObject(this)->engine()->parent();
auto* root = qobject_cast<RootWrapper*>(rootobj);
if (root == nullptr) {
qWarning() << "cannot find RootWrapper for reload, ignoring request";
return;
}
root->reloadGraph(hard);
}
void QtShell::earlyInit(QObject* old) {
auto* oldshell = qobject_cast<QtShell*>(old);

4
src/cpp/shell.hpp
View file

@ -2,7 +2,6 @@
#include <qcontainerfwd.h>
#include <qlist.h>
#include <qlogging.h>
#include <qobject.h>
#include <qqmlengine.h>
#include <qqmllist.h>
@ -24,9 +23,6 @@ public:
QQmlListProperty<QObject> components();
public slots:
void reload(bool hard = true);
private:
static void appendComponent(QQmlListProperty<QObject>* list, QObject* component);