Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Factory checked in at 2018-05-19 15:42:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old)
and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style"
Sat May 19 15:42:21 2018 rev:9 rq:607602 version:5.46.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes
2018-04-20 17:30:09.789030771 +0200
+++
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new/qqc2-desktop-style.changes
2018-05-19 15:42:29.390575896 +0200
@@ -1,0 +2,17 @@
+Sun May 13 21:03:12 UTC 2018 - [email protected]
+
+- Update to 5.46.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.46.0.php
+- Changes since 5.45.0:
+ * export layout paddings from qstyle, start from Control
+ * [ComboBox] Fix mouse wheel handling
+ * make the mousearea not interfere with controls
+ * fix acceptableInput
+ * remove useless debug
+ * Fix warning
+- Add upstream patch to fix control panel layouts (kde#394134):
+ * control-must-not-have-children.patch
+
+-------------------------------------------------------------------
Old:
----
qqc2-desktop-style-5.45.0.tar.xz
New:
----
control-must-not-have-children.patch
qqc2-desktop-style-5.46.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.5qsiPd/_old 2018-05-19 15:42:30.042552043 +0200
+++ /var/tmp/diff_new_pack.5qsiPd/_new 2018-05-19 15:42:30.046551896 +0200
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.45
+%define _tar_path 5.46
Name: qqc2-desktop-style
-Version: 5.45.0
+Version: 5.46.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0-or-later
@@ -27,6 +27,8 @@
Source:
https://download.kde.org/stable/frameworks/%{_tar_path}/qqc2-desktop-style-%{version}.tar.xz
# PATCH-FIX-OPENSUSE
Patch: fix-build-with-gcc48.patch
+# PATCH-FIX-UPSTREAM
+Patch1: control-must-not-have-children.patch
BuildRequires: extra-cmake-modules >= 0.0.8
BuildRequires: kf5-filesystem
# For dir ownership
@@ -70,6 +72,7 @@
%if 0%{?suse_version} < 1500
%patch -p1
%endif
+%patch1 -p1
%build
%cmake_kf5 -d build
++++++ control-must-not-have-children.patch ++++++
>From 8790d850c4343b9f615457f0926cc3cdcef8d0c7 Mon Sep 17 00:00:00 2001
From: Marco Martin <[email protected]>
Date: Mon, 14 May 2018 20:08:40 +0200
Subject: Control must not have children
this invisible child interfers badly with Kirigami FormLayout
BUG:394134
---
org.kde.desktop/Control.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/org.kde.desktop/Control.qml b/org.kde.desktop/Control.qml
index 40d8425..ce49342 100644
--- a/org.kde.desktop/Control.qml
+++ b/org.kde.desktop/Control.qml
@@ -37,7 +37,7 @@ T.Control {
rightPadding: styleItem.pixelMetric("layoutrightmargin")
bottomPadding: styleItem.pixelMetric("layoutbottommargin")
- StylePrivate.StyleItem {
+ property Item __style: StylePrivate.StyleItem {
id: styleItem
}
}
--
cgit v0.11.2
++++++ qqc2-desktop-style-5.45.0.tar.xz -> qqc2-desktop-style-5.46.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.45.0/CMakeLists.txt
new/qqc2-desktop-style-5.46.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.45.0/CMakeLists.txt 2018-04-07
09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/CMakeLists.txt 2018-05-05
14:40:14.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.45.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.45.0") # handled by release scripts
+set(KF5_VERSION "5.46.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.46.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.45.0 REQUIRED NO_MODULE)
+find_package(ECM 5.46.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}
${ECM_KDE_MODULE_DIR})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.45.0/org.kde.desktop/ComboBox.qml
new/qqc2-desktop-style-5.46.0/org.kde.desktop/ComboBox.qml
--- old/qqc2-desktop-style-5.45.0/org.kde.desktop/ComboBox.qml 2018-04-07
09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/org.kde.desktop/ComboBox.qml 2018-05-05
14:40:14.000000000 +0200
@@ -40,8 +40,8 @@
hoverEnabled: true
padding: 5
- leftPadding: padding + 5
- rightPadding: padding + 5
+ leftPadding: controlRoot.editable && controlRoot.mirrored ? 24 : padding
+ rightPadding: controlRoot.editable && !controlRoot.mirrored ? 24 : padding
delegate: ItemDelegate {
width: controlRoot.popup.width
@@ -54,44 +54,34 @@
indicator: Item {}
- contentItem: MouseArea {
- onPressed: mouse.accepted = false;
- onWheel: {
- if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) {
- controlRoot.currentIndex = Math.min(controlRoot.currentIndex +
1, delegateModel.count -1);
- } else {
- controlRoot.currentIndex = Math.max(controlRoot.currentIndex -
1, 0);
- }
- }
- T.TextField {
- anchors {
- fill: parent
- leftMargin: controlRoot.mirrored ? 12 : 1
- rightMargin: !controlRoot.mirrored ? 12 : 1
- }
+ contentItem: T.TextField {
+ padding: 0
- text: controlRoot.editText
+ text: controlRoot.editable ? controlRoot.editText :
controlRoot.displayText
- visible: typeof(controlRoot.editable) != "undefined" &&
controlRoot.editable
- readOnly: controlRoot.popup.visible
- inputMethodHints: controlRoot.inputMethodHints
- validator: controlRoot.validator
-
- // Work around Qt bug where NativeRendering breaks for non-integer
scale factors
- // https://bugreports.qt.io/browse/QTBUG-67007
- renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering :
Text.NativeRendering
- color: controlRoot.enabled ? Kirigami.Theme.textColor :
Kirigami.Theme.disabledTextColor
- selectionColor: Kirigami.Theme.highlightColor
- selectedTextColor: Kirigami.Theme.highlightedTextColor
- selectByMouse: true
-
- font: controlRoot.font
- horizontalAlignment: Text.AlignLeft
- verticalAlignment: Text.AlignVCenter
- opacity: controlRoot.enabled ? 1 : 0.3
- }
+ enabled: controlRoot.editable
+ autoScroll: controlRoot.editable
+ readOnly: controlRoot.down
+
+ visible: typeof(controlRoot.editable) != "undefined" &&
controlRoot.editable
+ inputMethodHints: controlRoot.inputMethodHints
+ validator: controlRoot.validator
+
+ // Work around Qt bug where NativeRendering breaks for non-integer
scale factors
+ // https://bugreports.qt.io/browse/QTBUG-67007
+ renderType: Screen.devicePixelRatio % 1 !== 0 ? Text.QtRendering :
Text.NativeRendering
+ color: controlRoot.enabled ? Kirigami.Theme.textColor :
Kirigami.Theme.disabledTextColor
+ selectionColor: Kirigami.Theme.highlightColor
+ selectedTextColor: Kirigami.Theme.highlightedTextColor
+ selectByMouse: true
+
+ font: controlRoot.font
+ horizontalAlignment: Text.AlignLeft
+ verticalAlignment: Text.AlignVCenter
+ opacity: controlRoot.enabled ? 1 : 0.3
}
+
background: StylePrivate.StyleItem {
id: styleitem
control: controlRoot
@@ -108,6 +98,23 @@
properties: {
"editable" : control.editable
}
+
+ MouseArea {
+ anchors {
+ fill: parent
+ leftMargin: controlRoot.leftPadding
+ rightMargin: controlRoot.rightPadding
+ }
+ acceptedButtons: Qt.NoButton
+ onWheel: {
+ if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) {
+ controlRoot.currentIndex =
Math.min(controlRoot.currentIndex + 1, delegateModel.count -1);
+ } else {
+ controlRoot.currentIndex =
Math.max(controlRoot.currentIndex - 1, 0);
+ }
+ controlRoot.activated(controlRoot.currentIndex);
+ }
+ }
}
popup: T.Popup {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.45.0/org.kde.desktop/Control.qml
new/qqc2-desktop-style-5.46.0/org.kde.desktop/Control.qml
--- old/qqc2-desktop-style-5.45.0/org.kde.desktop/Control.qml 2018-04-07
09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/org.kde.desktop/Control.qml 2018-05-05
14:40:14.000000000 +0200
@@ -22,6 +22,7 @@
import QtQuick 2.6
import QtQuick.Templates @QQC2_VERSION@ as T
+import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
T.Control {
id: control
@@ -30,4 +31,13 @@
(contentItem ? contentItem.implicitWidth : 0) +
leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
(contentItem ? contentItem.implicitHeight : 0) +
topPadding + bottomPadding)
+
+ leftPadding: styleItem.pixelMetric("layoutleftmargin")
+ topPadding: styleItem.pixelMetric("layouttopmargin")
+ rightPadding: styleItem.pixelMetric("layoutrightmargin")
+ bottomPadding: styleItem.pixelMetric("layoutbottommargin")
+
+ StylePrivate.StyleItem {
+ id: styleItem
+ }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.45.0/org.kde.desktop/ScrollView.qml
new/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollView.qml
--- old/qqc2-desktop-style-5.45.0/org.kde.desktop/ScrollView.qml
2018-04-07 09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollView.qml
2018-05-05 14:40:14.000000000 +0200
@@ -44,7 +44,6 @@
Component.onCompleted: {
if (!controlRoot.background) {
controlRoot.background =
backgroundComponent.createObject(controlRoot);
- print(controlRoot.background.width);
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.45.0/org.kde.desktop/ToolBar.qml
new/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolBar.qml
--- old/qqc2-desktop-style-5.45.0/org.kde.desktop/ToolBar.qml 2018-04-07
09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolBar.qml 2018-05-05
14:40:14.000000000 +0200
@@ -34,7 +34,7 @@
contentHeight: contentChildren[0].implicitHeight
contentItem: Item {}
-position: is("header") ? ToolBar.Header : ToolBar.Footer
+ position: controlRoot.parent.footer == controlRoot ? ToolBar.Footer :
ToolBar.Header
background: Rectangle {
implicitHeight: 40
color: Kirigami.Theme.backgroundColor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.45.0/plugin/kquickstyleitem.cpp
new/qqc2-desktop-style-5.46.0/plugin/kquickstyleitem.cpp
--- old/qqc2-desktop-style-5.45.0/plugin/kquickstyleitem.cpp 2018-04-07
09:49:08.000000000 +0200
+++ new/qqc2-desktop-style-5.46.0/plugin/kquickstyleitem.cpp 2018-05-05
14:40:14.000000000 +0200
@@ -1006,7 +1006,6 @@
int KQuickStyleItem::pixelMetric(const QString &metric)
{
-
if (metric == QLatin1String("scrollbarExtent"))
return qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent, nullptr);
else if (metric == QLatin1String("defaultframewidth"))
@@ -1049,6 +1048,18 @@
return
abs(qApp->style()->pixelMetric(QStyle::PM_ScrollView_ScrollBarSpacing,
nullptr));
else if (metric == QLatin1String("treeviewindentation"))
return qApp->style()->pixelMetric(QStyle::PM_TreeViewIndentation,
nullptr);
+ else if (metric == QLatin1String("layouthorizontalspacing"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing,
nullptr);
+ else if (metric == QLatin1String("layoutverticalspacing"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutVerticalSpacing,
nullptr);
+ else if (metric == QLatin1String("layoutleftmargin"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin,
nullptr);
+ else if (metric == QLatin1String("layouttopmargin"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin, nullptr);
+ else if (metric == QLatin1String("layoutrightmargin"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin,
nullptr);
+ else if (metric == QLatin1String("layoutbottommargin"))
+ return qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin,
nullptr);
return 0;
}
