Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2020-02-14 16:35:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Fri Feb 14 16:35:02 2020 rev:31 rq:773303 version:5.67.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2020-01-14 21:07:35.922771629 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.26092/qqc2-desktop-style.changes 2020-02-14 16:35:41.495529467 +0100 @@ -1,0 +2,27 @@ +Mon Feb 10 21:34:54 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Add upstream patch 0001-ScrollView-Use-scrollbar-height-as-bottom-padding-no.patch + +------------------------------------------------------------------- +Sun Feb 2 18:07:19 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Replace %make_jobs with %cmake_build. + +------------------------------------------------------------------- +Sun Feb 2 14:33:07 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.67.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.67.0.php +- Changes since 5.66.0: + * Remove scrollbar related workarounds from list delegates + * [TabBar] Remove frame + * Add active, link, visited, negative, neutral and positive background colors + * fix paddings + * use hasTransientTouchInput + * always round x and y + * support mobile mode scrollbar + * ScrollView: Do not overlay scrollbars over contents + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.66.0.tar.xz qqc2-desktop-style-5.66.0.tar.xz.sig New: ---- 0001-ScrollView-Use-scrollbar-height-as-bottom-padding-no.patch qqc2-desktop-style-5.67.0.tar.xz qqc2-desktop-style-5.67.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.eKjEGs/_old 2020-02-14 16:35:41.947529718 +0100 +++ /var/tmp/diff_new_pack.eKjEGs/_new 2020-02-14 16:35:41.947529718 +0100 @@ -16,11 +16,11 @@ # -%define _tar_path 5.66 +%define _tar_path 5.67 # Only needed for the package signature condition %bcond_without lang Name: qqc2-desktop-style -Version: 5.66.0 +Version: 5.67.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later @@ -31,6 +31,8 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz.sig Source2: frameworks.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-ScrollView-Use-scrollbar-height-as-bottom-padding-no.patch BuildRequires: extra-cmake-modules >= 0.0.8 # For dir ownership BuildRequires: kf5-filesystem @@ -72,11 +74,11 @@ Usually not needed as it is only a runtime dependency. %prep -%setup -q +%autosetup -p1 %build %cmake_kf5 -d build -%make_jobs +%cmake_build %install %kf5_makeinstall -C build ++++++ 0001-ScrollView-Use-scrollbar-height-as-bottom-padding-no.patch ++++++ >From 6995b4ae81a2f3ca3c24d2fa6d1560bfe0898737 Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra <ahiems...@heimr.nl> Date: Mon, 10 Feb 2020 11:47:00 +0100 Subject: [PATCH] ScrollView: Use scrollbar height as bottom padding, not width Summary: Apparently I accidentally used the bottom scrollbar width instead of height. Oops. Test Plan: ScrollView with horizontal scrollbar no longer hides content Reviewers: #plasma, davidedmundson Reviewed By: #plasma, davidedmundson Subscribers: plasma-devel Tags: #plasma Differential Revision: https://phabricator.kde.org/D27280 --- org.kde.desktop/ScrollView.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/org.kde.desktop/ScrollView.qml b/org.kde.desktop/ScrollView.qml index 4bea5c7..38bc8ed 100644 --- a/org.kde.desktop/ScrollView.qml +++ b/org.kde.desktop/ScrollView.qml @@ -45,7 +45,7 @@ T.ScrollView { rightPadding: (internal.backgroundVisible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0) + (!LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) bottomPadding: (internal.backgroundVisible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0) - + internal.horizontalScrollBarWidth + + internal.horizontalScrollBarHeight //create a background only after Component.onCompleted, see on the component creation below for explanation Component.onCompleted: { @@ -97,7 +97,7 @@ T.ScrollView { readonly property bool backgroundVisible: controlRoot.background && controlRoot.background.visible readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.vertical.width : 0 - readonly property real horizontalScrollBarWidth: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.width : 0 + readonly property real horizontalScrollBarHeight: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.height : 0 } ] ScrollBar.vertical: ScrollBar { -- 2.25.0 ++++++ qqc2-desktop-style-5.66.0.tar.xz -> qqc2-desktop-style-5.67.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/CMakeLists.txt new/qqc2-desktop-style-5.67.0/CMakeLists.txt --- old/qqc2-desktop-style-5.66.0/CMakeLists.txt 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/CMakeLists.txt 2020-02-01 10:09:01.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.66.0") # handled by release scripts -set(KF5_DEP_VERSION "5.66.0") # handled by release scripts +set(KF5_VERSION "5.67.0") # handled by release scripts +set(KF5_DEP_VERSION "5.67.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.66.0 REQUIRED NO_MODULE) +find_package(ECM 5.67.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}) @@ -110,7 +110,7 @@ ######################################################################### add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054200) add_subdirectory(plugin) if (KF5IconThemes_FOUND AND KF5WidgetsAddons_FOUND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp new/qqc2-desktop-style-5.67.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp --- old/qqc2-desktop-style-5.66.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2020-02-01 10:09:01.000000000 +0100 @@ -233,6 +233,12 @@ setBackgroundColor(colors.scheme.background(KColorScheme::NormalBackground).color()); setAlternateBackgroundColor(colors.scheme.background(KColorScheme::AlternateBackground).color()); setHighlightColor(colors.selectionScheme.background(KColorScheme::NormalBackground).color()); + setActiveBackgroundColor(colors.scheme.background(KColorScheme::ActiveBackground).color()); + setLinkBackgroundColor(colors.scheme.background(KColorScheme::LinkBackground).color()); + setVisitedLinkBackgroundColor(colors.scheme.background(KColorScheme::VisitedBackground).color()); + setNegativeBackgroundColor(colors.scheme.background(KColorScheme::NegativeBackground).color()); + setNeutralBackgroundColor(colors.scheme.background(KColorScheme::NeutralBackground).color()); + setPositiveBackgroundColor(colors.scheme.background(KColorScheme::PositiveBackground).color()); //decoration setHoverColor(colors.scheme.decoration(KColorScheme::HoverColor).color()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/CheckDelegate.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/CheckDelegate.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/CheckDelegate.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/CheckDelegate.qml 2020-02-01 10:09:01.000000000 +0100 @@ -36,10 +36,10 @@ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + leftPadding: padding*2 topPadding: padding - rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + rightPadding: padding*2 bottomPadding: padding contentItem: Label { @@ -63,21 +63,4 @@ } background: DefaultListItemBackground {} - - QtObject { - id: internal - property T.ScrollBar scrollBar - } - - Component.onCompleted: { - var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null) - //Search for a ScrollView - while (candidate) { - if (candidate.T.ScrollBar.vertical) { - internal.scrollBar = candidate.T.ScrollBar.vertical - break; - } - candidate = candidate.parent - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/ItemDelegate.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/ItemDelegate.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/ItemDelegate.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/ItemDelegate.qml 2020-02-01 10:09:01.000000000 +0100 @@ -36,10 +36,10 @@ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + leftPadding: padding*2 topPadding: padding - rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + rightPadding: padding*2 bottomPadding: padding contentItem: Label { @@ -55,22 +55,5 @@ verticalAlignment: Text.AlignVCenter } - QtObject { - id: internal - property T.ScrollBar scrollBar - } - - Component.onCompleted: { - var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null) - //Search for a ScrollView - while (candidate) { - if (candidate.T.ScrollBar.vertical) { - internal.scrollBar = candidate.T.ScrollBar.vertical - break; - } - candidate = candidate.parent - } - } - background: DefaultListItemBackground {} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/RadioDelegate.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/RadioDelegate.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/RadioDelegate.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/RadioDelegate.qml 2020-02-01 10:09:01.000000000 +0100 @@ -36,10 +36,10 @@ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + leftPadding: padding*2 topPadding: padding - rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + rightPadding: padding*2 bottomPadding: padding contentItem: Label { @@ -63,21 +63,4 @@ } background: DefaultListItemBackground {} - - QtObject { - id: internal - property T.ScrollBar scrollBar - } - - Component.onCompleted: { - var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null) - //Search for a ScrollView - while (candidate) { - if (candidate.T.ScrollBar.vertical) { - internal.scrollBar = candidate.T.ScrollBar.vertical - break; - } - candidate = candidate.parent - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/ScrollBar.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/ScrollBar.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/ScrollBar.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/ScrollBar.qml 2020-02-01 10:09:01.000000000 +0100 @@ -23,7 +23,7 @@ import QtQuick 2.6 import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate import QtQuick.Templates @QQC2_VERSION@ as T -import org.kde.kirigami 2.4 as Kirigami +import org.kde.kirigami 2.11 as Kirigami T.ScrollBar { id: controlRoot @@ -36,11 +36,63 @@ visible: controlRoot.size < 1.0 && controlRoot.policy !== T.ScrollBar.AlwaysOff stepSize: 0.02 + interactive: !Kirigami.Settings.hasTransientTouchInput + + onPositionChanged: { + disappearTimer.restart(); + handleGraphics.handleState = Math.min(1, handleGraphics.handleState + 0.1) + } + + contentItem: Item { + visible: !controlRoot.interactive + + Rectangle { + id: handleGraphics + property real handleState: 0 + + x: Math.round(controlRoot.orientation == Qt.Vertical + ? (parent.width - width) - (parent.width/2 - width/2) * handleState + : 0) + + y: Math.round(controlRoot.orientation == Qt.Horizontal + ? (parent.height - height) - (parent.height/2 - height/2) * handleState + : 0) + + + NumberAnimation { + id: resetAnim + target: handleGraphics + property: "handleState" + from: handleGraphics.handleState + to: 0 + duration: Kirigami.Units.longDuration + easing.type: Easing.InOutQuad + } + + width: Math.round(controlRoot.orientation == Qt.Vertical + ? Math.max(2, Kirigami.Units.smallSpacing * handleState) + : parent.width) + height: Math.round(controlRoot.orientation == Qt.Horizontal + ? Math.max(2, Kirigami.Units.smallSpacing * handleState) + : parent.height) + radius: Math.min(width, height) + color: Kirigami.Theme.textColor + opacity: 0.3 + Timer { + id: disappearTimer + interval: 1000 + onTriggered: { + resetAnim.restart(); + handleGraphics.handleState = 0; + } + } + } + } background: MouseArea { id: mouseArea anchors.fill: parent - visible: controlRoot.size < 1.0 + visible: controlRoot.size < 1.0 && interactive hoverEnabled: true state: "inactive" acceptedButtons: Qt.LeftButton | Qt.MiddleButton @@ -185,6 +237,4 @@ } ] } - - contentItem: Item {} } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/ScrollView.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/ScrollView.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/ScrollView.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/ScrollView.qml 2020-02-01 10:09:01.000000000 +0100 @@ -39,10 +39,13 @@ Kirigami.Theme.inherit: !background || !background.visible //size in pixel to accomodate the border drawn by qstyle - leftPadding: background && background.visible && background.hasOwnProperty("leftPadding") ? background.leftPadding : 0 - topPadding: background && background.visible && background.hasOwnProperty("topPadding") ? background.topPadding : 0 - rightPadding: background && background.visible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0 - bottomPadding: background && background.visible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0 + leftPadding: (internal.backgroundVisible && background.hasOwnProperty("leftPadding") ? background.leftPadding : 0) + + (LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) + topPadding: internal.backgroundVisible && background.hasOwnProperty("topPadding") ? background.topPadding : 0 + rightPadding: (internal.backgroundVisible && background.hasOwnProperty("rightPadding") ? background.rightPadding : 0) + + (!LayoutMirroring.enabled ? internal.verticalScrollBarWidth : 0) + bottomPadding: (internal.backgroundVisible && background.hasOwnProperty("bottomPadding") ? background.bottomPadding : 0) + + internal.horizontalScrollBarWidth //create a background only after Component.onCompleted, see on the component creation below for explanation Component.onCompleted: { @@ -87,13 +90,24 @@ hover: controlRoot.hovered } } + }, + + QtObject { + id: internal + + readonly property bool backgroundVisible: controlRoot.background && controlRoot.background.visible + readonly property real verticalScrollBarWidth: controlRoot.ScrollBar.vertical.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.vertical.width : 0 + readonly property real horizontalScrollBarWidth: controlRoot.ScrollBar.horizontal.visible && !Kirigami.Settings.tabletMode ? controlRoot.ScrollBar.horizontal.width : 0 } ] ScrollBar.vertical: ScrollBar { id: verticalScrollBar parent: controlRoot enabled: controlRoot.contentItem.enabled - x: controlRoot.mirrored ? 0 : controlRoot.width - width + + x: controlRoot.mirrored + ? (internal.backgroundVisible && controlRoot.background.hasOwnProperty("leftPadding") ? controlRoot.background.leftPadding : 0) + : controlRoot.width - width - (internal.backgroundVisible && controlRoot.background.hasOwnProperty("rightPadding") ? controlRoot.background.rightPadding: 0) y: controlRoot.topPadding height: controlRoot.availableHeight active: controlRoot.ScrollBar.horizontal || controlRoot.ScrollBar.horizontal.active @@ -103,7 +117,7 @@ parent: controlRoot enabled: controlRoot.contentItem.enabled x: controlRoot.leftPadding - y: controlRoot.height - height + y: controlRoot.height - height - (internal.backgroundVisible && controlRoot.background.hasOwnProperty("bottomPadding") ? controlRoot.background.bottomPadding : 0) width: controlRoot.availableWidth active: controlRoot.ScrollBar.vertical || controlRoot.ScrollBar.vertical.active } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/SwitchDelegate.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/SwitchDelegate.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/SwitchDelegate.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/SwitchDelegate.qml 2020-02-01 10:09:01.000000000 +0100 @@ -36,10 +36,10 @@ padding: Kirigami.Settings.tabletMode ? Kirigami.Units.largeSpacing : Kirigami.Units.smallSpacing - leftPadding: LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + leftPadding: padding*2 topPadding: padding - rightPadding: !LayoutMirroring.enabled && internal.scrollBar && internal.scrollBar.visible ? internal.scrollBar.width : padding*2 + rightPadding: padding*2 bottomPadding: padding contentItem: Label { @@ -63,21 +63,4 @@ } background: DefaultListItemBackground {} - - QtObject { - id: internal - property T.ScrollBar scrollBar - } - - Component.onCompleted: { - var candidate = controlRoot.ListView.view || (controlRoot.parent ? controlRoot.parent.ListView.view : null) - //Search for a ScrollView - while (candidate) { - if (candidate.T.ScrollBar.vertical) { - internal.scrollBar = candidate.T.ScrollBar.vertical - break; - } - candidate = candidate.parent - } - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.66.0/org.kde.desktop/TabBar.qml new/qqc2-desktop-style-5.67.0/org.kde.desktop/TabBar.qml --- old/qqc2-desktop-style-5.66.0/org.kde.desktop/TabBar.qml 2020-01-04 00:15:37.000000000 +0100 +++ new/qqc2-desktop-style-5.67.0/org.kde.desktop/TabBar.qml 2020-02-01 10:09:01.000000000 +0100 @@ -77,17 +77,5 @@ controlRoot.currentIndex = Math.max(controlRoot.currentIndex - 1, 0); } } - - Rectangle { - anchors { - left: parent.left - right: parent.right - bottom : controlRoot.position == T.TabBar.Header ? parent.bottom : undefined - top : controlRoot.position == T.TabBar.Header ? undefined : parent.top - } - height: 1 - color: Kirigami.Theme.textColor - opacity: 0.4 - } } }
