Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2022-03-14 19:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon Mar 14 19:35:00 2022 rev:56 rq:961289 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2022-02-24 18:22:41.194670592 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.25692/qqc2-desktop-style.changes 2022-03-14 19:36:37.838095036 +0100 @@ -1,0 +2,21 @@ +Mon Mar 7 09:27:21 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Thicken menus on transient touch as well as being in Tablet Mode + * PlasmaDesktopTheme: ensure we initialise the colours + * Fix typo + * PlasmaDesktopTheme: Do not compute the colors for invisible items + * PlasmaDesktopTheme: Do not call syncColors after syncWindow + * Menu: use hmargin and vmargin from QStyle + * Support displaying icons in ItemDelegate (kde#425867) + * fix checkbox position for CheckDelegate + * Drop lib prefix when building for Windows + * KQuickStyleItem: Simplify the updatePolish + * Use correct DBus signal for listening for font changes + * Use raw pointer instead of QPointer to track watchers + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.91.0.tar.xz qqc2-desktop-style-5.91.0.tar.xz.sig New: ---- qqc2-desktop-style-5.92.0.tar.xz qqc2-desktop-style-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.PtQnIw/_old 2022-03-14 19:36:38.318095612 +0100 +++ /var/tmp/diff_new_pack.PtQnIw/_new 2022-03-14 19:36:38.322095616 +0100 @@ -16,11 +16,11 @@ # -%define _tar_path 5.91 +%define _tar_path 5.92 # Only needed for the package signature condition %bcond_without released Name: qqc2-desktop-style -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later @@ -34,6 +34,7 @@ BuildRequires: extra-cmake-modules # For dir ownership BuildRequires: kf5-filesystem +BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5IconThemes) BuildRequires: cmake(KF5Kirigami2) ++++++ qqc2-desktop-style-5.91.0.tar.xz -> qqc2-desktop-style-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/CMakeLists.txt new/qqc2-desktop-style-5.92.0/CMakeLists.txt --- old/qqc2-desktop-style-5.91.0/CMakeLists.txt 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/CMakeLists.txt 2022-03-05 12:20:52.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts -set(KF_DEP_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts +set(KF_DEP_VERSION "5.92.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.91.0 REQUIRED NO_MODULE) +find_package(ECM 5.92.0 REQUIRED NO_MODULE) # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp new/qqc2-desktop-style-5.92.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp --- old/qqc2-desktop-style-5.91.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2022-03-05 12:20:52.000000000 +0100 @@ -38,13 +38,13 @@ { connect(qGuiApp, &QGuiApplication::paletteChanged, this, &StyleSingleton::refresh); - // Use DBus in order to listen for kdeglobals changes directly, as the + // Use DBus in order to listen for settings changes directly, as the // QApplication doesn't expose the font variants we're looking for, // namely smallFont. QDBusConnection::sessionBus().connect(QString(), - QStringLiteral("/KGlobalSettings"), - QStringLiteral("org.kde.KGlobalSettings"), - QStringLiteral("notifyChange"), + QStringLiteral("/KDEPlatformTheme"), + QStringLiteral("org.kde.KDEPlatformTheme"), + QStringLiteral("refreshFonts"), this, SLOT(notifyWatchersConfigurationChange())); @@ -175,7 +175,7 @@ KColorScheme viewScheme; QFont smallFont; - QVector<QPointer<PlasmaDesktopTheme>> watchers; + QVector<PlasmaDesktopTheme *> watchers; private: QHash<QPair<Kirigami::PlatformTheme::ColorSet, QPalette::ColorGroup>, Colors> m_cache; @@ -190,6 +190,7 @@ auto parentItem = qobject_cast<QQuickItem *>(parent); if (parentItem) { connect(parentItem, &QQuickItem::enabledChanged, this, &PlasmaDesktopTheme::syncColors); + connect(parentItem, &QQuickItem::visibleChanged, this, &PlasmaDesktopTheme::syncColors); connect(parentItem, &QQuickItem::windowChanged, this, &PlasmaDesktopTheme::syncWindow); } @@ -199,7 +200,9 @@ setSmallFont((*s_style)->smallFont); syncWindow(); - syncColors(); + if (!m_window) { + syncColors(); + } } PlasmaDesktopTheme::~PlasmaDesktopTheme() @@ -251,6 +254,9 @@ QPalette::ColorGroup group = (QPalette::ColorGroup)colorGroup(); auto parentItem = qobject_cast<QQuickItem *>(parent()); if (parentItem) { + if (!parentItem->isVisible()) { + return; + } if (!parentItem->isEnabled()) { group = QPalette::Disabled; // Why also checking the window is exposed? diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/org.kde.desktop/CheckDelegate.qml new/qqc2-desktop-style-5.92.0/org.kde.desktop/CheckDelegate.qml --- old/qqc2-desktop-style-5.91.0/org.kde.desktop/CheckDelegate.qml 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/org.kde.desktop/CheckDelegate.qml 2022-03-05 12:20:52.000000000 +0100 @@ -17,6 +17,9 @@ implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: Math.max(contentItem.implicitHeight, indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + + spacing: indicator && typeof indicator.pixelMetric === "function" ? indicator.pixelMetric("checkboxlabelspacing") : Kirigami.Units.smallSpacing + hoverEnabled: true padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing @@ -44,7 +47,7 @@ } indicator: CheckIndicator { - x: controlRoot.mirrored ? controlRoot.leftPadding : controlRoot.width - width - controlRoot.rightPadding + x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2 control: controlRoot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/org.kde.desktop/ItemDelegate.qml new/qqc2-desktop-style-5.92.0/org.kde.desktop/ItemDelegate.qml --- old/qqc2-desktop-style-5.91.0/org.kde.desktop/ItemDelegate.qml 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/org.kde.desktop/ItemDelegate.qml 2022-03-05 12:20:52.000000000 +0100 @@ -7,6 +7,7 @@ import QtQuick 2.5 +import QtQuick.Layouts 1.2 import QtQuick.Templates @QQC2_VERSION@ as T import org.kde.kirigami 2.4 as Kirigami import "private" @@ -27,17 +28,29 @@ rightPadding: padding*2 bottomPadding: padding - contentItem: Label { - leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0 - rightPadding: !controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0 - - text: controlRoot.text - font: controlRoot.font - color: controlRoot.highlighted || controlRoot.checked || (controlRoot.pressed && !controlRoot.checked && !controlRoot.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : (controlRoot.enabled ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor) - elide: Text.ElideRight - visible: controlRoot.text - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignVCenter + contentItem: RowLayout { + spacing: Kirigami.Units.smallSpacing + Kirigami.Icon { + Layout.alignment: Qt.AlignVCenter + visible: controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0) + source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" + Layout.preferredHeight: Kirigami.Units.iconSizes.small + Layout.preferredWidth: Layout.preferredHeight + } + Label { + leftPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0 + rightPadding: !controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0 + + text: controlRoot.text + font: controlRoot.font + color: controlRoot.highlighted || controlRoot.checked || (controlRoot.pressed && !controlRoot.checked && !controlRoot.sectionDelegate) ? Kirigami.Theme.highlightedTextColor : (controlRoot.enabled ? Kirigami.Theme.textColor : Kirigami.Theme.disabledTextColor) + elide: Text.ElideRight + visible: controlRoot.text + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignVCenter + Layout.alignment: Qt.AlignLeft + Layout.fillWidth: true + } } background: DefaultListItemBackground {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/org.kde.desktop/Menu.qml new/qqc2-desktop-style-5.92.0/org.kde.desktop/Menu.qml --- old/qqc2-desktop-style-5.91.0/org.kde.desktop/Menu.qml 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/org.kde.desktop/Menu.qml 2022-03-05 12:20:52.000000000 +0100 @@ -10,6 +10,7 @@ import QtQuick.Layouts 1.2 import QtQuick.Controls @QQC2_VERSION@ import QtQuick.Templates @QQC2_VERSION@ as T +import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import org.kde.kirigami 2.12 as Kirigami T.Menu { @@ -21,6 +22,12 @@ contentItem ? contentItem.implicitHeight : 0) + topPadding + bottomPadding margins: 0 + horizontalPadding: style.pixelMetric("menuhmargin") + verticalPadding: style.pixelMetric("menuhmargin") + StylePrivate.StyleItem { + id: style + visible: false + } delegate: MenuItem { onImplicitWidthChanged: control.contentItem.contentItem.childrenChanged() } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/org.kde.desktop/MenuItem.qml new/qqc2-desktop-style-5.92.0/org.kde.desktop/MenuItem.qml --- old/qqc2-desktop-style-5.91.0/org.kde.desktop/MenuItem.qml 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/org.kde.desktop/MenuItem.qml 2022-03-05 12:20:52.000000000 +0100 @@ -25,7 +25,7 @@ Layout.fillWidth: true padding: Kirigami.Units.smallSpacing - verticalPadding: Kirigami.Settings.tabletMode ? 8 : 4 // Hardcoded to the Breeze theme value + verticalPadding: Kirigami.Settings.hasTransientTouchInput ? 8 : 4 // Hardcoded to the Breeze theme value hoverEnabled: !Kirigami.Settings.isMobile Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible @@ -53,7 +53,7 @@ visible: (controlRoot.ListView.view && controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined && (controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0)) source: controlRoot.icon ? (controlRoot.icon.name || controlRoot.icon.source) : "" color: controlRoot.icon ? controlRoot.icon.color : "transparent" - Layout.preferredHeight: Kirigami.Settings.tabletMode ? Kirigami.Units.iconSizes.smallMedium : Kirigami.Units.iconSizes.small + Layout.preferredHeight: Kirigami.Settings.hasTransientTouchInput ? Kirigami.Units.iconSizes.smallMedium : Kirigami.Units.iconSizes.small Layout.preferredWidth: Layout.preferredHeight } Label { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/plugin/CMakeLists.txt new/qqc2-desktop-style-5.92.0/plugin/CMakeLists.txt --- old/qqc2-desktop-style-5.91.0/plugin/CMakeLists.txt 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/plugin/CMakeLists.txt 2022-03-05 12:20:52.000000000 +0100 @@ -24,5 +24,9 @@ ) endif() +if(WIN32 AND BUILD_SHARED_LIBS) + set_target_properties(qqc2desktopstyleplugin PROPERTIES PREFIX "") +endif() + install(TARGETS qqc2desktopstyleplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private) install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/qqc2desktopstyle/private) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.91.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.92.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.91.0/plugin/kquickstyleitem.cpp 2022-02-05 16:19:51.000000000 +0100 +++ new/qqc2-desktop-style-5.92.0/plugin/kquickstyleitem.cpp 2022-03-05 12:20:52.000000000 +0100 @@ -1870,11 +1870,13 @@ void KQuickStyleItem::updatePolish() { - if (width() >= 1 && height() >= 1) { // Note these are reals so 1 pixel is minimum - float devicePixelRatio = window() ? window()->devicePixelRatio() : qApp->devicePixelRatio(); - int w = m_textureWidth > 0 ? m_textureWidth : width(); - int h = m_textureHeight > 0 ? m_textureHeight : height(); - m_image = QImage(w * devicePixelRatio, h * devicePixelRatio, QImage::Format_ARGB32_Premultiplied); + if (isVisible() && width() >= 1 && height() >= 1) { // Note these are reals so 1 pixel is minimum + const qreal devicePixelRatio = window() ? window()->devicePixelRatio() : qApp->devicePixelRatio(); + const QSize size = QSize(m_textureWidth > 0 ? m_textureWidth : width(), m_textureHeight > 0 ? m_textureHeight : height()) * devicePixelRatio; + + if (m_image.size() != size) { + m_image = QImage(size, QImage::Format_ARGB32_Premultiplied); + } m_image.setDevicePixelRatio(devicePixelRatio); m_image.fill(Qt::transparent); QPainter painter(&m_image);
