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 2023-01-16 17:58:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Mon Jan 16 17:58:50 2023 rev:66 rq:1058538 version:5.102.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2022-12-12 17:41:11.041629304 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.32243/qqc2-desktop-style.changes 2023-01-16 18:01:17.675621390 +0100 @@ -1,0 +2,14 @@ +Thu Jan 12 08:19:17 UTC 2023 - Christophe Marin <[email protected]> + +- Update to 5.102.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.102.0 +- Changes since 5.101.0: + * kquickstyleitem fix clazy warning clazy-qstring-arg + * CheckBox/RadioButton/Switch: update implicit sizing code + * CheckBox/RadioButton/Switch: center align indicators when no content + * CheckBox/RadioButton/Switch: align indicators with 1st text line + * Button/ToolButton: allow menu arrows to be added by Accessible.role + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.101.0.tar.xz qqc2-desktop-style-5.101.0.tar.xz.sig New: ---- qqc2-desktop-style-5.102.0.tar.xz qqc2-desktop-style-5.102.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.PcDg3n/_old 2023-01-16 18:01:18.111623837 +0100 +++ /var/tmp/diff_new_pack.PcDg3n/_new 2023-01-16 18:01:18.115623859 +0100 @@ -16,11 +16,11 @@ # -%define _tar_path 5.101 +%define _tar_path 5.102 # Only needed for the package signature condition %bcond_without released Name: qqc2-desktop-style -Version: 5.101.0 +Version: 5.102.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.101.0.tar.xz -> qqc2-desktop-style-5.102.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/CMakeLists.txt new/qqc2-desktop-style-5.102.0/CMakeLists.txt --- old/qqc2-desktop-style-5.101.0/CMakeLists.txt 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/CMakeLists.txt 2023-01-07 01:35:11.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.101.0") # handled by release scripts -set(KF_DEP_VERSION "5.101.0") # handled by release scripts +set(KF_VERSION "5.102.0") # handled by release scripts +set(KF_DEP_VERSION "5.102.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.101.0 REQUIRED NO_MODULE) +find_package(ECM 5.102.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.101.0/org.kde.desktop/Button.qml new/qqc2-desktop-style-5.102.0/org.kde.desktop/Button.qml --- old/qqc2-desktop-style-5.101.0/org.kde.desktop/Button.qml 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/org.kde.desktop/Button.qml 2023-01-07 01:35:11.000000000 +0100 @@ -48,6 +48,7 @@ "iconColor": controlRoot.icon && controlRoot.icon.color.a > 0? controlRoot.icon.color : Kirigami.Theme.textColor, "iconWidth": controlRoot.icon && controlRoot.icon.width ? controlRoot.icon.width : 0, "iconHeight": controlRoot.icon && controlRoot.icon.height ? controlRoot.icon.height : 0, + "menu": controlRoot.Accessible.role === Accessible.ButtonMenu } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/org.kde.desktop/CheckBox.qml new/qqc2-desktop-style-5.102.0/org.kde.desktop/CheckBox.qml --- old/qqc2-desktop-style-5.101.0/org.kde.desktop/CheckBox.qml 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/org.kde.desktop/CheckBox.qml 2023-01-07 01:35:11.000000000 +0100 @@ -15,11 +15,12 @@ T.CheckBox { id: controlRoot - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding, + implicitIndicatorWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset spacing: indicator && typeof indicator.pixelMetric === "function" ? indicator.pixelMetric("checkboxlabelspacing") : Kirigami.Units.smallSpacing @@ -27,11 +28,18 @@ hoverEnabled: true indicator: CheckIndicator { - LayoutMirroring.enabled: controlRoot.mirrored - LayoutMirroring.childrenInherit: true - anchors { - left: parent.left - verticalCenter: parent.verticalCenter + x: if (control.contentItem !== null && control.contentItem.width > 0) { + return control.mirrored ? + control.width - width - control.rightPadding : control.leftPadding + } else { + return control.leftPadding + (control.availableWidth - width) / 2 + } + y: if (control.contentItem !== null + && (control.contentItem instanceof Text || control.contentItem instanceof TextEdit) + && control.contentItem.lineCount > 1) { + return control.topPadding + } else { + return control.topPadding + Math.round((control.availableHeight - height) / 2) } control: controlRoot } @@ -50,6 +58,11 @@ readonly property int indicatorEffectiveWidth: controlRoot.indicator && typeof controlRoot.indicator.pixelMetric === "function" && controlRoot.icon.name == "" && controlRoot.icon.source == "" ? controlRoot.indicator.pixelMetric("indicatorwidth") + controlRoot.spacing : controlRoot.indicator.width + property FontMetrics fontMetrics: FontMetrics {} + // Ensure consistent vertical position relative to indicator with multiple lines. + // No need to round because .5 from the top will add with .5 from the bottom becoming 1. + topPadding: Math.max(0, (controlRoot.implicitIndicatorHeight - fontMetrics.height) / 2) + bottomPadding: topPadding leftPadding: controlRoot.indicator && !controlRoot.mirrored ? indicatorEffectiveWidth : 0 rightPadding: controlRoot.indicator && controlRoot.mirrored ? indicatorEffectiveWidth : 0 opacity: controlRoot.enabled ? 1 : 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/org.kde.desktop/RadioButton.qml new/qqc2-desktop-style-5.102.0/org.kde.desktop/RadioButton.qml --- old/qqc2-desktop-style-5.101.0/org.kde.desktop/RadioButton.qml 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/org.kde.desktop/RadioButton.qml 2023-01-07 01:35:11.000000000 +0100 @@ -15,11 +15,12 @@ T.RadioButton { id: controlRoot - implicitWidth: Math.max(background ? background.implicitWidth : 0, - contentItem.implicitWidth + leftPadding + rightPadding) - implicitHeight: Math.max(background ? background.implicitHeight : 0, - Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding) + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding, + implicitIndicatorWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset spacing: indicator && typeof indicator.pixelMetric === "function" ? indicator.pixelMetric("radiobuttonlabelspacing") : Kirigami.Units.smallSpacing @@ -27,11 +28,18 @@ hoverEnabled: true indicator: CheckIndicator { - LayoutMirroring.enabled: controlRoot.mirrored - LayoutMirroring.childrenInherit: true - anchors { - left: parent.left - verticalCenter: parent.verticalCenter + x: if (control.contentItem !== null && control.contentItem.width > 0) { + return control.mirrored ? + control.width - width - control.rightPadding : control.leftPadding + } else { + return control.leftPadding + (control.availableWidth - width) / 2 + } + y: if (control.contentItem !== null + && (control.contentItem instanceof Text || control.contentItem instanceof TextEdit) + && control.contentItem.lineCount > 1) { + return control.topPadding + } else { + return control.topPadding + Math.round((control.availableHeight - height) / 2) } control: controlRoot } @@ -50,6 +58,11 @@ readonly property int indicatorEffectiveWidth: controlRoot.indicator && typeof controlRoot.indicator.pixelMetric === "function" && controlRoot.icon.name == "" && controlRoot.icon.source == "" ? controlRoot.indicator.pixelMetric("exclusiveindicatorwidth") + controlRoot.spacing : controlRoot.indicator.width + property FontMetrics fontMetrics: FontMetrics {} + // Ensure consistent vertical position relative to indicator with multiple lines. + // No need to round because .5 from the top will add with .5 from the bottom becoming 1. + topPadding: Math.max(0, (controlRoot.implicitIndicatorHeight - fontMetrics.height) / 2) + bottomPadding: topPadding leftPadding: controlRoot.indicator && !controlRoot.mirrored ? indicatorEffectiveWidth : 0 rightPadding: controlRoot.indicator && controlRoot.mirrored ? indicatorEffectiveWidth : 0 opacity: controlRoot.enabled ? 1 : 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/org.kde.desktop/Switch.qml new/qqc2-desktop-style-5.102.0/org.kde.desktop/Switch.qml --- old/qqc2-desktop-style-5.101.0/org.kde.desktop/Switch.qml 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/org.kde.desktop/Switch.qml 2023-01-07 01:35:11.000000000 +0100 @@ -13,9 +13,12 @@ T.Switch { id: control - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: Math.max(contentItem.implicitHeight, - indicator ? indicator.implicitHeight : 0) + topPadding + bottomPadding + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + implicitContentWidth + leftPadding + rightPadding, + implicitIndicatorWidth + leftPadding + rightPadding) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + implicitContentHeight + topPadding + bottomPadding, + implicitIndicatorHeight + topPadding + bottomPadding) baselineOffset: contentItem.y + contentItem.baselineOffset padding: 1 @@ -24,12 +27,18 @@ hoverEnabled: true indicator: SwitchIndicator { - LayoutMirroring.enabled: control.mirrored - LayoutMirroring.childrenInherit: true - height: 22 - anchors { - left: parent.left - verticalCenter: parent.verticalCenter + x: if (control.contentItem !== null && control.contentItem.width > 0) { + return control.mirrored ? + control.width - width - control.rightPadding : control.leftPadding + } else { + return control.leftPadding + (control.availableWidth - width) / 2 + } + y: if (control.contentItem !== null + && (control.contentItem instanceof Text || control.contentItem instanceof TextEdit) + && control.contentItem.lineCount > 1) { + return control.topPadding + } else { + return control.topPadding + Math.round((control.availableHeight - height) / 2) } control: control } @@ -45,6 +54,11 @@ } contentItem: Label { + property FontMetrics fontMetrics: FontMetrics {} + // Ensure consistent vertical position relative to indicator with multiple lines. + // No need to round because .5 from the top will add with .5 from the bottom becoming 1. + topPadding: Math.max(0, (controlRoot.implicitIndicatorHeight - fontMetrics.height) / 2) + bottomPadding: topPadding leftPadding: control.indicator && !control.mirrored ? control.indicator.width + control.spacing : 0 rightPadding: control.indicator && control.mirrored ? control.indicator.width + control.spacing : 0 opacity: control.enabled ? 1 : 0.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/org.kde.desktop/ToolButton.qml new/qqc2-desktop-style-5.102.0/org.kde.desktop/ToolButton.qml --- old/qqc2-desktop-style-5.101.0/org.kde.desktop/ToolButton.qml 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/org.kde.desktop/ToolButton.qml 2023-01-07 01:35:11.000000000 +0100 @@ -50,12 +50,13 @@ hasFocus: controlRoot.visualFocus || (!controlRoot.flat && controlRoot.pressed) || controlRoot.highlighted flat: controlRoot.flat - // Set this to true to have the style render a menu arrow for the - // ToolButton. - // Note: If you use this, ensure you check whether your background item + // Set this to true or set `Accessible.role: Accessible.ButtonMenu` + // to have the style render a menu arrow for the ToolButton. + // Note: If you use this directly, ensure you check whether your background item // has this property at all, otherwise things will break with different // QtQuick styles! - property bool showMenuArrow: false + // TODO KF6: remove + property bool showMenuArrow: controlRoot.Accessible.role === Accessible.ButtonMenu readonly property bool hasIcon: controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0 readonly property int toolButtonStyle: { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.101.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.102.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.101.0/plugin/kquickstyleitem.cpp 2022-12-03 10:54:01.000000000 +0100 +++ new/qqc2-desktop-style-5.102.0/plugin/kquickstyleitem.cpp 2023-01-07 01:35:11.000000000 +0100 @@ -1899,7 +1899,7 @@ } #ifdef QSG_RUNTIME_DESCRIPTION - qsgnode_set_description(styleNode, QString::fromLatin1("%1:%2, '%3'").arg(styleName()).arg(elementType()).arg(text())); + qsgnode_set_description(styleNode, QString::fromLatin1("%1:%2, '%3'").arg(styleName(), elementType(), text())); #endif styleNode->setTexture(window()->createTextureFromImage(m_image, QQuickWindow::TextureCanUseAtlas));
