Differential D27322 Diff 75472 applets/pager/plugin/pagermodel.cpp

Changeset View

Standalone View

applets/pager/plugin/pagermodel.cpp

Context not available.
574	}	574		}
575	}	575		}
576		576
577	void PagerModel::drop(QMimeData *mimeData, const QVariant &itemId)	577		void PagerModel::drop(QMimeData *mimeData, int modifiers, const QVariant &itemId)
578	{	578		{
579	if (!mimeData) {	579		if (!mimeData) {
580	return;	580		return;
Context not available.
605	for (const auto &id : ids) {	605		for (const auto &id : ids) {
606	QStringList activities = KWindowInfo(id, NET::Properties(), NET::WM2Activities).activities();	606		QStringList activities = KWindowInfo(id, NET::Properties(), NET::WM2Activities).activities();
607		607
608	if (!activities.contains(newActivity)) {	608		if (modifiers & Qt::ControlModifier) { // 'copy' => add
609	KWindowSystem::setOnActivities(id, activities << newActivity);	609		if (!activities.contains(newActivity)) {
		610		KWindowSystem::setOnActivities(id, activities << newActivity);
		611		}
		612		} else { // 'move' to activity
		613		// if on only one activity, set it to only the new activity
		614		// if on >1 activity, remove it from the current activity and add it to the new activity
		615		QString currentActivity = d->activityInfo->currentActivity();
			davidedmundsonUnsubmitted Not Done const davidedmundson: const
		616		//qDebug() << id << " is on " << activities << ", removing from " << currentActivity;
			davidedmundsonUnsubmitted Not Done please port to qCDebug() and uncomment (or just remove) davidedmundson: please port to qCDebug() and uncomment (or just remove)
		617		activities.removeAll(currentActivity);
		618		//qDebug() << "leaves " << activities << ", adding activity " << newActivity;
		619		activities << newActivity;
		620		KWindowSystem::setOnActivities(id, activities);
610	}	621		}
611	}	622		}
612	}	623		}
Context not available.