forked from quickshell/quickshell
		
	screens: make screen list changes not recreate QuickshellScreenInfos
Fixes Variants recreating windows on existing screens and causing flickering.
This commit is contained in:
		
							parent
							
								
									15cd78e30c
								
							
						
					
					
						commit
						3789709820
					
				
					 1 changed files with 20 additions and 6 deletions
				
			
		| 
						 | 
				
			
			@ -120,17 +120,31 @@ void QuickshellGlobal::setWatchFiles(bool watchFiles) { // NOLINT
 | 
			
		|||
 | 
			
		||||
void QuickshellGlobal::updateScreens() {
 | 
			
		||||
	auto screens = QGuiApplication::screens();
 | 
			
		||||
	this->mScreens.resize(screens.size());
 | 
			
		||||
	auto newScreens = QList<QuickshellScreenInfo*>();
 | 
			
		||||
 | 
			
		||||
	for (auto i = 0; i < screens.size(); i++) {
 | 
			
		||||
		if (this->mScreens[i] != nullptr) {
 | 
			
		||||
			this->mScreens[i]->screen = nullptr;
 | 
			
		||||
			this->mScreens[i]->setParent(nullptr); // delete if not owned by the js engine
 | 
			
		||||
	for (auto* newScreen: screens) {
 | 
			
		||||
		for (auto i = 0; i < this->mScreens.length(); i++) {
 | 
			
		||||
			auto* oldScreen = this->mScreens[i];
 | 
			
		||||
			if (newScreen == oldScreen->screen) {
 | 
			
		||||
				newScreens.push_back(oldScreen);
 | 
			
		||||
				this->mScreens.remove(i);
 | 
			
		||||
				goto next;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		this->mScreens[i] = new QuickshellScreenInfo(this, screens[i]);
 | 
			
		||||
		{
 | 
			
		||||
			auto* si = new QuickshellScreenInfo(this, newScreen);
 | 
			
		||||
			QQmlEngine::setObjectOwnership(si, QQmlEngine::CppOwnership);
 | 
			
		||||
			newScreens.push_back(si);
 | 
			
		||||
		}
 | 
			
		||||
	next:;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	for (auto* oldScreen: this->mScreens) {
 | 
			
		||||
		oldScreen->deleteLater();
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	this->mScreens = newScreens;
 | 
			
		||||
	emit this->screensChanged();
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue