outfoxxed
/
quickshell
1
1
Fork 2
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all/window: use global screeninfo pool for screen getter

This commit is contained in:
outfoxxed 2024-03-27 02:43:14 -07:00
parent 9cbd5abd96
commit 3026d3400a
Signed by: outfoxxed
GPG Key ID: 4C88A185FB89301E
4 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/proxywindow.cpp
View File

@ -13,6 +13,7 @@
#include <qwindow.h> #include <qwindow.h>
#include "generation.hpp" #include "generation.hpp"
#include "qmlglobal.hpp"
#include "qmlscreen.hpp" #include "qmlscreen.hpp"
#include "region.hpp" #include "region.hpp"
#include "reload.hpp" #include "reload.hpp"
@ -231,6 +232,8 @@ void ProxyWindowBase::setScreen(QuickshellScreenInfo* screen) {
} }
auto* qscreen = screen == nullptr ? nullptr : screen->screen; auto* qscreen = screen == nullptr ? nullptr : screen->screen;
if (qscreen == this->mScreen) return;
if (qscreen != nullptr) { if (qscreen != nullptr) {
QObject::connect(qscreen, &QObject::destroyed, this, &ProxyWindowBase::onScreenDestroyed); QObject::connect(qscreen, &QObject::destroyed, this, &ProxyWindowBase::onScreenDestroyed);
} }
@ -257,10 +260,7 @@ QuickshellScreenInfo* ProxyWindowBase::screen() const {
qscreen = this->window->screen(); qscreen = this->window->screen();
} }
return new QuickshellScreenInfo( return QuickshellTracked::instance()->screenInfo(qscreen);
const_cast<ProxyWindowBase*>(this), // NOLINT
qscreen
);
} }
QColor ProxyWindowBase::color() const { QColor ProxyWindowBase::color() const {

9
src/core/qmlglobal.cpp
View File

@ -11,6 +11,7 @@
#include <qqmlcontext.h> #include <qqmlcontext.h>
#include <qqmlengine.h> #include <qqmlengine.h>
#include <qqmllist.h> #include <qqmllist.h>
#include <qscreen.h>
#include <qtenvironmentvariables.h> #include <qtenvironmentvariables.h>
#include <qtmetamacros.h> #include <qtmetamacros.h>
#include <qtypes.h> #include <qtypes.h>
@ -73,6 +74,14 @@ QuickshellTracked::QuickshellTracked() {
} }
} }
QuickshellScreenInfo* QuickshellTracked::screenInfo(QScreen* screen) const {
for (auto* info: this->screens) {
if (info->screen == screen) return info;
}
return nullptr;
}
QuickshellTracked* QuickshellTracked::instance() { QuickshellTracked* QuickshellTracked::instance() {
static QuickshellTracked* instance = nullptr; // NOLINT static QuickshellTracked* instance = nullptr; // NOLINT
if (instance == nullptr) { if (instance == nullptr) {

2
src/core/qmlglobal.hpp
View File

@ -6,6 +6,7 @@
#include <qqmlengine.h> #include <qqmlengine.h>
#include <qqmlintegration.h> #include <qqmlintegration.h>
#include <qqmllist.h> #include <qqmllist.h>
#include <qscreen.h>
#include <qtmetamacros.h> #include <qtmetamacros.h>
#include <qtypes.h> #include <qtypes.h>
#include <qvariant.h> #include <qvariant.h>
@ -60,6 +61,7 @@ public:
QuickshellTracked(); QuickshellTracked();
QVector<QuickshellScreenInfo*> screens; QVector<QuickshellScreenInfo*> screens;
QuickshellScreenInfo* screenInfo(QScreen* screen) const;
static QuickshellTracked* instance(); static QuickshellTracked* instance();

6
src/wayland/session_lock.cpp
View File

@ -14,6 +14,7 @@
#include <qtmetamacros.h> #include <qtmetamacros.h>
#include <qtypes.h> #include <qtypes.h>
#include "../core/qmlglobal.hpp"
#include "../core/qmlscreen.hpp" #include "../core/qmlscreen.hpp"
#include "../core/reload.hpp" #include "../core/reload.hpp"
#include "session_lock/session_lock.hpp" #include "session_lock/session_lock.hpp"
@ -243,10 +244,7 @@ QuickshellScreenInfo* WlSessionLockSurface::screen() const {
qscreen = this->window->screen(); qscreen = this->window->screen();
} }
return new QuickshellScreenInfo( return QuickshellTracked::instance()->screenInfo(qscreen);
const_cast<WlSessionLockSurface*>(this), // NOLINT
qscreen
);
} }
void WlSessionLockSurface::setScreen(QScreen* qscreen) { void WlSessionLockSurface::setScreen(QScreen* qscreen) {