From 0565d3533f003d81ea7b27de47d118d5f78e7354 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 18 May 2023 12:53:51 +0300 Subject: [PATCH] correct desktop indices for main widget --- sources/extsysmonsources/desktopsource.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sources/extsysmonsources/desktopsource.cpp b/sources/extsysmonsources/desktopsource.cpp index 778e022..871dd15 100644 --- a/sources/extsysmonsources/desktopsource.cpp +++ b/sources/extsysmonsources/desktopsource.cpp @@ -46,13 +46,14 @@ QVariant DesktopSource::data(const QString &_source) { qCDebug(LOG_ESS) << "Source" << _source; - auto increment = KWindowSystem::isPlatformX11() ? 0 : 1; - auto current = m_vdi->position(m_vdi->currentDesktop()) + increment; + auto nativeIndex = m_vdi->position(m_vdi->currentDesktop()); + auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0; + auto current = nativeIndex - decrement; if (_source == "desktop/current/name") { return m_vdi->desktopNames().at(current); } else if (_source == "desktop/current/number") { - return current; + return current + 1; } else if (_source == "desktop/total/name") { return m_vdi->desktopNames(); } else if (_source == "desktop/total/number") {