diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-26 14:59:08 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-26 14:59:08 +0100 |
commit | 1503b28e7a30c164cab750c27268f704b8a5cec6 (patch) | |
tree | d06a47a18b0fb792e95f88ea6e18af234eb0b9d5 /kde-plasma/kwin/files | |
parent | 34ce8f465101950c92cb66c657d3244b5a8397db (diff) |
gentoo auto-resync : 26:07:2022 - 14:59:07
Diffstat (limited to 'kde-plasma/kwin/files')
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch | 30 | ||||
-rw-r--r-- | kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch | 40 |
2 files changed, 70 insertions, 0 deletions
diff --git a/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch b/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch new file mode 100644 index 000000000000..79ee3cc547ce --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.24.6-emit-rowsChanged.patch @@ -0,0 +1,30 @@ +From 4f419afe307f808ab648a6d6c473ff3cd0b9d836 Mon Sep 17 00:00:00 2001 +From: ivan tkachenko <me@ratijas.tk> +Date: Sun, 10 Jul 2022 15:17:26 +0300 +Subject: [PATCH] [kcm/kwindesktop] Emit rowsChanged signal to fix default + state highlighting + +Without this, the rowsChanged signal wasn't emitting at startup, so the +binding `highlight: kcm.desktopsModel.rows !== 2` didn't work correctly. + +FIXED-IN: 5.24.7 5.25.3 5.26 +--- + src/kcmkwin/kwindesktop/desktopsmodel.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/kcmkwin/kwindesktop/desktopsmodel.cpp b/src/kcmkwin/kwindesktop/desktopsmodel.cpp +index cf147a7981..f8dd8d6260 100644 +--- a/src/kcmkwin/kwindesktop/desktopsmodel.cpp ++++ b/src/kcmkwin/kwindesktop/desktopsmodel.cpp +@@ -457,6 +457,8 @@ void DesktopsModel::getAllAndConnect(const QDBusMessage &msg) + m_names = m_serverSideNames; + m_rows = m_serverSideRows; + endResetModel(); ++ ++ Q_EMIT rowsChanged(); + } + + Q_EMIT readyChanged(); +-- +GitLab + diff --git a/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch b/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch new file mode 100644 index 000000000000..545bc96d0230 --- /dev/null +++ b/kde-plasma/kwin/files/kwin-5.24.6-fix-color-picker.patch @@ -0,0 +1,40 @@ +From aa5fc42349052d040f45aca40749edce80ff8f1f Mon Sep 17 00:00:00 2001 +From: ivan tkachenko <me@ratijas.tk> +Date: Fri, 22 Jul 2022 18:43:45 +0300 +Subject: [PATCH] effects/colorpicker: Fix picking colors + +Due to the wrong buffer format, the function failed with +GL_INVALID_OPERATION error, which was silently ignored by the effect. +It resulted in the constant phantom color being returned over and over +again. + +Co-Authored-By: David Edmundson <kde@davidedmundson.co.uk> +BUG: 454974 +FIXED-IN: 5.24.7, 5.25.4, 5.26 +(cherry picked from commit df6331b60aa03e65f146e93d0229cdc6dc956bbd) +--- + src/effects/colorpicker/colorpicker.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/effects/colorpicker/colorpicker.cpp b/src/effects/colorpicker/colorpicker.cpp +index bc60225838..0625b3de47 100644 +--- a/src/effects/colorpicker/colorpicker.cpp ++++ b/src/effects/colorpicker/colorpicker.cpp +@@ -61,12 +61,12 @@ void ColorPickerEffect::postPaintScreen() + effects->postPaintScreen(); + + if (m_scheduledPosition != QPoint(-1, -1) && (!m_paintedScreen || m_paintedScreen->geometry().contains(m_scheduledPosition))) { +- uint8_t data[3]; ++ uint8_t data[4]; + const QRect geo = GLRenderTarget::virtualScreenGeometry(); + const QPoint screenPosition(m_scheduledPosition.x() - geo.x(), m_scheduledPosition.y() - geo.y()); + const QPoint texturePosition(screenPosition.x() * GLRenderTarget::virtualScreenScale(), (geo.height() - screenPosition.y()) * GLRenderTarget::virtualScreenScale()); + +- glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGB, GL_UNSIGNED_BYTE, 3, data); ++ glReadnPixels(texturePosition.x(), texturePosition.y(), 1, 1, GL_RGBA, GL_UNSIGNED_BYTE, 4, data); + QDBusConnection::sessionBus().send(m_replyMessage.createReply(QColor(data[0], data[1], data[2]))); + m_picking = false; + m_scheduledPosition = QPoint(-1, -1); +-- +GitLab + |