Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qqc2-breeze-style for
openSUSE:Factory checked in at 2021-03-02 12:31:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-breeze-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-breeze-style.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-breeze-style"
Tue Mar 2 12:31:59 2021 rev:2 rq:875052 version:5.21.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-breeze-style/qqc2-breeze-style.changes
2021-02-16 09:18:56.823163612 +0100
+++
/work/SRC/openSUSE:Factory/.qqc2-breeze-style.new.2378/qqc2-breeze-style.changes
2021-03-02 12:44:34.628309897 +0100
@@ -1,0 +2,14 @@
+Tue Feb 23 14:52:12 UTC 2021 - Fabian Vogt <[email protected]>
+
+- Update to 5.21.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.21.1
+- Changes since 5.21.0:
+ * use Templates.RangeSlider to not crash
+ * [Slider] Remove endVisualPosition
+ * [SliderGroove] Rework sizing
+ * [SliderHandle] Adjust x/y animation velocity and color animation
+ * [Slider] Remove inset
+
+-------------------------------------------------------------------
Old:
----
qqc2-breeze-style-5.21.0.tar.xz
qqc2-breeze-style-5.21.0.tar.xz.sig
New:
----
qqc2-breeze-style-5.21.1.tar.xz
qqc2-breeze-style-5.21.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-breeze-style.spec ++++++
--- /var/tmp/diff_new_pack.zhQ8t9/_old 2021-03-02 12:44:35.088310294 +0100
+++ /var/tmp/diff_new_pack.zhQ8t9/_new 2021-03-02 12:44:35.088310294 +0100
@@ -18,7 +18,7 @@
%bcond_without lang
Name: qqc2-breeze-style
-Version: 5.21.0
+Version: 5.21.1
Release: 0
Summary: Breeze Style for Qt Quick Controls 2
License: LGPL-2.1-only OR LGPL-3.0-only
++++++ qqc2-breeze-style-5.21.0.tar.xz -> qqc2-breeze-style-5.21.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-breeze-style-5.21.0/style/impl/SliderGroove.qml
new/qqc2-breeze-style-5.21.1/style/impl/SliderGroove.qml
--- old/qqc2-breeze-style-5.21.0/style/impl/SliderGroove.qml 2021-02-11
13:24:12.000000000 +0100
+++ new/qqc2-breeze-style-5.21.1/style/impl/SliderGroove.qml 2021-02-23
14:17:37.000000000 +0100
@@ -5,23 +5,43 @@
import QtQuick 2.15
import QtQuick.Controls 2.15 as Controls
+import QtQuick.Templates 2.15 as Templates
import org.kde.kirigami 2.14 as Kirigami
Rectangle {
id: root
- property alias control: root.parent
- property real startPosition: control.first ? control.first.position : 0
- property real endPosition: control.second ? control.second.position :
control.position
- property real endVisualPosition: control.second ?
control.second.visualPosition : control.visualPosition
+ property Templates.Control control
+ property real startPosition: isRangeSlider ? control.first.position : 0
+ property real endPosition: isRangeSlider ? control.second.position :
control.position
- implicitWidth: control.horizontal ? 200 : Kirigami.Units.grooveHeight
- implicitHeight: control.vertical ? 200 : Kirigami.Units.grooveHeight
+ readonly property bool isRangeSlider: control instanceof
Templates.RangeSlider
- // RTL support
- scale: control.horizontal && control.mirrored ? -1 : 1
+ readonly property real handleWidth: isRangeSlider ?
control.first.handle.width ?? 0 : control.handle.width ?? 0
+ readonly property real handleHeight: isRangeSlider ?
control.first.handle.height ?? 0 : control.handle.height ?? 0
+ readonly property real secondHandleWidth: isRangeSlider ?
control.second.handle.width ?? 0 : handleWidth
+ readonly property real secondHandleHeight: isRangeSlider ?
control.second.handle.height ?? 0 : handleHeight
- radius: Math.min(width/2, height/2)
+ readonly property bool horizontal: root.control.horizontal
+ readonly property bool vertical: root.control.vertical
+
+
+ implicitWidth: root.horizontal ? 200 : Kirigami.Units.grooveHeight
+ implicitHeight: root.vertical ? 200 : Kirigami.Units.grooveHeight
+
+
+ //NOTE: Manually setting x,y,width,height because that's what the Basic,
Fusion and Material QQC2 styles do.
+ // Inset would be more idiomatic for QQC2, but this is easier to deal with
for now since the behavior is expected by app devs.
+
+ width: root.horizontal ? control.availableWidth - root.handleWidth/2 -
secondHandleWidth/2 + Kirigami.Units.grooveHeight : implicitWidth
+ height: root.vertical ? control.availableHeight - root.handleHeight/2 -
secondHandleHeight/2 + Kirigami.Units.grooveHeight : implicitHeight
+
+ x: control.leftPadding + (root.horizontal ?
+ (control.mirrored ? root.secondHandleWidth/2 : root.handleWidth/2) -
radius
+ : (control.availableWidth - width) / 2)
+ y: control.topPadding + (root.vertical ? root.secondHandleHeight/2 -
radius : (control.availableHeight - height) / 2)
+
+ radius: Kirigami.Units.grooveHeight/2
color: Kirigami.Theme.backgroundColor
border {
width: Kirigami.Units.smallBorder
@@ -30,14 +50,13 @@
Rectangle {
id: fill
- x: root.control.horizontal ? root.startPosition * parent.width : 0
- y: root.control.vertical ? root.endVisualPosition * parent.height : 0
- width: root.control.horizontal ?
- root.endPosition * parent.width - root.startPosition * parent.width
- : Kirigami.Units.grooveHeight
- height: root.control.vertical ?
- root.endPosition * parent.height - root.startPosition *
parent.height
- : Kirigami.Units.grooveHeight
+ anchors {
+ fill: parent
+ leftMargin: root.horizontal ? root.startPosition * parent.width -
(root.startPosition * Kirigami.Units.grooveHeight) : 0
+ rightMargin: root.horizontal ? (1-root.endPosition) * parent.width
- ((1-root.endPosition) * Kirigami.Units.grooveHeight) : 0
+ topMargin: root.vertical ? (1-root.endPosition) * parent.height -
((1-root.endPosition) * Kirigami.Units.grooveHeight) : 0
+ bottomMargin: root.vertical ? root.startPosition * parent.height -
(root.startPosition * Kirigami.Units.grooveHeight) : 0
+ }
radius: parent.radius
color: Kirigami.Theme.alternateBackgroundColor
@@ -46,33 +65,33 @@
color: Kirigami.Theme.focusColor
}
- Behavior on x {
+ Behavior on anchors.leftMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: root.implicitWidth*4
+ velocity: 800
//SmoothedAnimations have a hardcoded InOutQuad easing
}
}
- Behavior on y {
+ Behavior on anchors.rightMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: root.implicitHeight*4
+ velocity: 800
}
}
- Behavior on width {
+ Behavior on anchors.topMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: root.implicitWidth*4
+ velocity: 800
}
}
- Behavior on height {
+ Behavior on anchors.bottomMargin {
enabled: fill.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: root.implicitHeight*4
+ velocity: 800
}
}
@@ -88,4 +107,37 @@
awfulHackTimer.start()
}
}
+
+ // Maybe enable this? Depends on what our app devs want.
+ /*Loader {
+ id: tickmarkLoader
+ visible: root.control.stepSize > 0
+ active: visible
+ anchors {
+ left: root.horizontal ? parent.left : parent.right
+ top: root.vertical ? parent.top : parent.bottom
+ leftMargin: root.horizontal ? parent.radius :
Kirigami.Units.smallBorder
+ topMargin: root.vertical ? parent.radius :
Kirigami.Units.smallBorder
+ }
+ width: root.vertical ? implicitWidth : root.width - parent.radius
+ height: root.horizontal ? implicitHeight : root.height - parent.radius
+ sourceComponent: Grid {
+ id: markGrid
+ rows: root.vertical ? markRepeater.model : 1
+ columns: root.horizontal ? markRepeater.model : 1
+ spacing: (root.vertical ? height/(markRepeater.model-1) :
width/(markRepeater.model-1)) - Kirigami.Units.smallBorder*2
+ Repeater {
+ id: markRepeater
+ model: (root.control.to -
root.control.from)/root.control.stepSize + 1
+ delegate: Rectangle {
+ implicitWidth: root.vertical ? root.x -
Kirigami.Units.smallBorder : Kirigami.Units.smallBorder
+ implicitHeight: root.horizontal ? root.y -
Kirigami.Units.smallBorder : Kirigami.Units.smallBorder
+ color: (root.horizontal && x >= fill.x && x <= fill.x +
fill.width)
+ || (root.vertical && y >= fill.y && y <= fill.y +
fill.height)
+ ? Kirigami.Theme.focusColor
+ : Kirigami.Theme.separatorColor
+ }
+ }
+ }
+ }*/
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-breeze-style-5.21.0/style/impl/SliderHandle.qml
new/qqc2-breeze-style-5.21.1/style/impl/SliderHandle.qml
--- old/qqc2-breeze-style-5.21.0/style/impl/SliderHandle.qml 2021-02-11
13:24:12.000000000 +0100
+++ new/qqc2-breeze-style-5.21.1/style/impl/SliderHandle.qml 2021-02-23
14:17:37.000000000 +0100
@@ -53,15 +53,22 @@
color: Kirigami.Theme.backgroundColor
border {
width: Kirigami.Units.smallBorder
- color: (root.pressed || root.visualFocus || root.hovered) &&
control.enabled ?
- Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
+ color: root.pressed || root.visualFocus || root.hovered ?
Kirigami.Theme.focusColor : Kirigami.Theme.separatorColor
+ }
+
+ Behavior on border.color {
+ enabled: root.pressed || root.visualFocus || root.hovered
+ ColorAnimation {
+ duration: Kirigami.Units.shortDuration
+ easing.type: Easing.OutCubic
+ }
}
Behavior on x {
enabled: root.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: control.implicitBackgroundWidth*4
+ velocity: 800
//SmoothedAnimations have a hardcoded InOutQuad easing
}
}
@@ -69,7 +76,7 @@
enabled: root.loaded && !Kirigami.Settings.hasTransientTouchInput
SmoothedAnimation {
duration: Kirigami.Units.longDuration
- velocity: control.implicitBackgroundHeight*4
+ velocity: 800
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-breeze-style-5.21.0/style/qtquickcontrols/Slider.qml
new/qqc2-breeze-style-5.21.1/style/qtquickcontrols/Slider.qml
--- old/qqc2-breeze-style-5.21.0/style/qtquickcontrols/Slider.qml
2021-02-11 13:24:12.000000000 +0100
+++ new/qqc2-breeze-style-5.21.1/style/qtquickcontrols/Slider.qml
2021-02-23 14:17:37.000000000 +0100
@@ -20,18 +20,6 @@
padding: Kirigami.Settings.tabletMode ? Kirigami.Units.mediumSpacing : 0
- property bool __hasHandle: Boolean(control.handle)
- property real __preInset: Math.max(
- (__hasHandle ?
- handle.width : Kirigami.Units.inlineControlHeight) -
implicitBackgroundWidth,
- (__hasHandle ?
- handle.height : Kirigami.Units.inlineControlHeight) -
implicitBackgroundHeight
- )/2
- leftInset: __preInset + leftPadding
- rightInset: __preInset + rightPadding
- topInset: __preInset + topPadding
- bottomInset: __preInset + bottomPadding
-
handle: SliderHandle {
control: control
}
@@ -56,6 +44,5 @@
control: control
startPosition: 0
endPosition: control.position
- endVisualPosition: control.visualPosition
}
}
