Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2020-07-14 07:55:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.3060 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Tue Jul 14 07:55:07 2020 rev:36 rq:820408 version:5.72.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2020-06-16 13:44:58.181580393 +0200 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.3060/qqc2-desktop-style.changes 2020-07-14 07:57:28.833438183 +0200 @@ -1,0 +2,16 @@ +Sun Jul 5 07:55:55 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.72.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.72.0 +- Changes since 5.71.0: + * Set selectByMouse to true for SpinBox + * Fix menu icons becoming blurry with some font sizes (kde#423236) + * Prevent delegates and scrollbar overlapping in combobox popups + * Fix Slider vertical implicitWidth and a binding loop + * Make ToolTips more consistent with Breeze widget style tooltips + * Set editable to true by default for SpinBox + * Fix Connections warnings in Menu.qml + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.71.0.tar.xz qqc2-desktop-style-5.71.0.tar.xz.sig New: ---- qqc2-desktop-style-5.72.0.tar.xz qqc2-desktop-style-5.72.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.uAq5oK/_old 2020-07-14 07:57:29.853441485 +0200 +++ /var/tmp/diff_new_pack.uAq5oK/_new 2020-07-14 07:57:29.857441498 +0200 @@ -16,11 +16,11 @@ # -%define _tar_path 5.71 +%define _tar_path 5.72 # Only needed for the package signature condition %bcond_without lang Name: qqc2-desktop-style -Version: 5.71.0 +Version: 5.72.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later @@ -31,7 +31,7 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz.sig Source2: frameworks.keyring %endif -BuildRequires: extra-cmake-modules >= 0.0.8 +BuildRequires: extra-cmake-modules # For dir ownership BuildRequires: kf5-filesystem BuildRequires: cmake(KF5ConfigWidgets) @@ -83,15 +83,16 @@ %kf5_makeinstall -C build %files -%license LICENSE* -%{_kf5_qmldir}/QtQuick/Controls.2/org.kde.desktop/ +%license LICENSES/* +%dir %{_kf5_plugindir}/kf5/kirigami/ %dir %{_kf5_qmldir}/org/ %dir %{_kf5_qmldir}/org/kde/ -%dir %{_kf5_plugindir}/kf5/kirigami/ %{_kf5_plugindir}/kf5/kirigami/org.kde.desktop.so +%{_kf5_qmldir}/QtQuick/Controls.2/org.kde.desktop/ %{_kf5_qmldir}/org/kde/qqc2desktopstyle/ %files devel +%license LICENSES/* %{_kf5_libdir}/cmake/KF5QQC2DesktopStyle/ # Legacy alias with typo... %{_kf5_libdir}/cmake/KF5QQC2DeskopStyle/ ++++++ qqc2-desktop-style-5.71.0.tar.xz -> qqc2-desktop-style-5.72.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/CMakeLists.txt new/qqc2-desktop-style-5.72.0/CMakeLists.txt --- old/qqc2-desktop-style-5.71.0/CMakeLists.txt 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/CMakeLists.txt 2020-07-04 11:59:39.000000000 +0200 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.71.0") # handled by release scripts -set(KF5_DEP_VERSION "5.71.0") # handled by release scripts +set(KF5_VERSION "5.72.0") # handled by release scripts +set(KF5_DEP_VERSION "5.72.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.71.0 REQUIRED NO_MODULE) +find_package(ECM 5.72.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}) @@ -140,6 +140,14 @@ set(DISABLE_UNDER_QQC2_2_4 "") endif() +if (Qt5Qml_VERSION_STRING VERSION_GREATER_EQUAL 5.14) + set(DISABLE_UNDER_QT_5_14 "") + set(DISABLE_AT_QT_5_14 "//Disabled since Qt 5.14 ") +else() + set(DISABLE_UNDER_QT_5_14 "//Needs Qt 5.14 ") + set(DISABLE_AT_QT_5_14 "") +endif() + # Find all the source qml files FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop/*") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/ComboBox.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/ComboBox.qml 2020-07-04 11:59:39.000000000 +0200 @@ -32,7 +32,7 @@ rightPadding: controlRoot.editable && !controlRoot.mirrored ? 24 : padding delegate: ItemDelegate { - width: controlRoot.popup.width + width: listView.width text: controlRoot.textRole ? (Array.isArray(controlRoot.model) ? modelData[controlRoot.textRole] : model[controlRoot.textRole]) : modelData highlighted: mouseArea.pressed ? listView.currentIndex == index : controlRoot.highlightedIndex == index property bool separatorVisible: false @@ -205,22 +205,25 @@ // like ApplicationWindow, which we don't want. Controls.Overlay.modal: Item { } - contentItem: ListView { - id: listView - - // this causes us to load at least one delegate - // this is essential in guessing the contentHeight - // which is needed to initially resize the popup - cacheBuffer: 1 - - implicitHeight: contentHeight - model: controlRoot.delegateModel - delegate: controlRoot.delegate - currentIndex: controlRoot.highlightedIndex - highlightRangeMode: ListView.ApplyRange - highlightMoveDuration: 0 - boundsBehavior: Flickable.StopAtBounds - T.ScrollBar.vertical: Controls.ScrollBar { } + contentItem: ScrollView { + background: Rectangle {} + ScrollBar.horizontal.policy: ScrollBar.AlwaysOff + ListView { + id: listView + + // this causes us to load at least one delegate + // this is essential in guessing the contentHeight + // which is needed to initially resize the popup + cacheBuffer: 1 + + implicitHeight: contentHeight + model: controlRoot.delegateModel + delegate: controlRoot.delegate + currentIndex: controlRoot.highlightedIndex + highlightRangeMode: ListView.ApplyRange + highlightMoveDuration: 0 + boundsBehavior: Flickable.StopAtBounds + } } background: Kirigami.ShadowedRectangle { anchors { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/Menu.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/Menu.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/Menu.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/Menu.qml 2020-07-04 11:59:39.000000000 +0200 @@ -49,7 +49,12 @@ Connections { target: control.contentItem.contentItem - onChildrenChanged: { + +@DISABLE_UNDER_QT_5_14@ function + onChildrenChanged +@DISABLE_UNDER_QT_5_14@ () +@DISABLE_AT_QT_5_14@ : + { for (var i in control.contentItem.contentItem.children) { var child = control.contentItem.contentItem.children[i]; if (child.checkable) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/MenuItem.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/MenuItem.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/MenuItem.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/MenuItem.qml 2020-07-04 11:59:39.000000000 +0200 @@ -57,7 +57,7 @@ color: controlRoot.icon ? controlRoot.icon.color : "transparent" //hovered is for retrocompatibility selected: (controlRoot.highlighted || controlRoot.hovered) - Layout.preferredHeight: Math.max(label.height, Kirigami.Units.iconSizes.small) + Layout.preferredHeight: Math.max(Kirigami.Units.fontMetrics.roundedIconSize(label.height), Kirigami.Units.iconSizes.small) Layout.preferredWidth: Layout.preferredHeight } Label { @@ -95,7 +95,7 @@ @DISABLE_UNDER_QQC2_2_3@ y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2 @DISABLE_UNDER_QQC2_2_3@ source: controlRoot.mirrored ? "go-next-symbolic-rtl" : "go-next-symbolic" @DISABLE_UNDER_QQC2_2_3@ selected: controlRoot.highlighted -@DISABLE_UNDER_QQC2_2_3@ width: Math.max(label.height, Kirigami.Units.iconSizes.small) +@DISABLE_UNDER_QQC2_2_3@ width: Math.max(Kirigami.Units.fontMetrics.roundedIconSize(label.height), Kirigami.Units.iconSizes.small) @DISABLE_UNDER_QQC2_2_3@ height: width @DISABLE_UNDER_QQC2_2_3@ visible: controlRoot.subMenu @DISABLE_UNDER_QQC2_2_3@ } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/Slider.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/Slider.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/Slider.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/Slider.qml 2020-07-04 11:59:39.000000000 +0200 @@ -16,8 +16,8 @@ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette Kirigami.Theme.colorSet: Kirigami.Theme.Button - implicitWidth: Kirigami.Units.gridUnit * 12 - implicitHeight: background.implicitHeight + implicitWidth: background.horizontal ? Kirigami.Units.gridUnit * 12 : background.implicitWidth + implicitHeight: background.horizontal ? background.implicitHeight : Kirigami.Units.gridUnit * 12 hoverEnabled: true LayoutMirroring.enabled: Qt.application.layoutDirection === Qt.RightToLeft @@ -31,8 +31,8 @@ elementType: "slider" sunken: controlRoot.pressed implicitWidth: 200 - contentHeight: horizontal ? 22 : implicitWidth - contentWidth: horizontal ? implicitWidth : 22 + contentWidth: horizontal ? controlRoot.implicitWidth : 22 + contentHeight: horizontal ? 22 : controlRoot.implicitHeight maximum: controlRoot.to*100 minimum: controlRoot.from*100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/SpinBox.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/SpinBox.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/SpinBox.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/SpinBox.qml 2020-07-04 11:59:39.000000000 +0200 @@ -27,6 +27,7 @@ hoverEnabled: true + editable: true validator: IntValidator { locale: controlRoot.locale.name @@ -43,6 +44,7 @@ color: Kirigami.Theme.textColor selectionColor: Kirigami.Theme.highlightColor selectedTextColor: Kirigami.Theme.highlightedTextColor + selectByMouse: true horizontalAlignment: Qt.AlignHCenter verticalAlignment: Qt.AlignVCenter diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.71.0/org.kde.desktop/ToolTip.qml new/qqc2-desktop-style-5.72.0/org.kde.desktop/ToolTip.qml --- old/qqc2-desktop-style-5.71.0/org.kde.desktop/ToolTip.qml 2020-06-06 21:36:41.000000000 +0200 +++ new/qqc2-desktop-style-5.72.0/org.kde.desktop/ToolTip.qml 2020-07-04 11:59:39.000000000 +0200 @@ -24,8 +24,10 @@ // Always show the tooltip on top of everything else z: 999 - implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding - implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding + // Math.ceil() prevents blurry edges and prevents unecessary text wrapping + // (vs using floor or sometimes round). + implicitWidth: Math.ceil(contentItem.implicitWidth) + leftPadding + rightPadding + implicitHeight: Math.ceil(contentItem.implicitHeight) + topPadding + bottomPadding margins: 6 padding: 6 @@ -45,15 +47,22 @@ color: Kirigami.Theme.textColor } + // TODO: Consider replacing this with a StyleItem background: Kirigami.ShadowedRectangle { radius: 3 - opacity: 0.95 color: Kirigami.Theme.backgroundColor Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip + // Roughly but doesn't exactly match the medium shadow setting for Breeze menus/tooltips. + // TODO: Find a way to more closely match the user's Breeze settings. shadow.xOffset: 0 - shadow.yOffset: 2 - shadow.size: 4 - shadow.color: Qt.rgba(0, 0, 0, 0.3) + shadow.yOffset: 4 + shadow.size: 16 + shadow.color: Qt.rgba(0, 0, 0, 0.2) + + border.width: 1 + // TODO: Replace this with a frame or separator color role if that becomes a thing. + // Matches the color used by Breeze::Style::drawPanelTipLabelPrimitive() + border.color: Kirigami.ColorUtils.linearInterpolation(background.color, Kirigami.Theme.textColor, 0.25) } }
