Hello community,
here is the log from the commit of package qqc2-desktop-style for
openSUSE:Factory checked in at 2018-06-23 19:59:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Jun 23 19:59:08 2018 rev:10 rq:616803 version:5.47.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes
2018-05-19 15:42:29.390575896 +0200
+++
/work/SRC/openSUSE:Factory/.qqc2-desktop-style.new/qqc2-desktop-style.changes
2018-06-23 19:59:12.167598648 +0200
@@ -1,0 +2,32 @@
+Tue Jun 12 21:26:10 UTC 2018 - [email protected]
+
+- Update to 5.47.0
+ * New feature release
+ * For more details please see:
+ * https://www.kde.org/announcements/kde-frameworks-5.47.0.php
+- Changes since 5.46.0:
+ * Use pallet property only when using qtquickcontrols 2.4
+ * work with Qt<5.10
+ * add missing import
+ * fix height of tabbar
+ * Use Control.palette
+ * --warnings
+ * [RadioButton] Rename "control" to "controlRoot"
+ * Don't set explicit spacing on RadioButton/CheckBox
+ * [FocusRect] Use manual placement instead of anchors
+ * import focusrect
+ * import FocusRect
+ * It turns out the flickable in a scrollview is the contentItem
+ * Use override
+ * Show focus rect when CheckBox or RadioButton are focused
+ * hacky fix to scrollview detection
+ * don't reparent the flickable to the mousearea
+ * Add test file for ScrollView { TextArea {} }
+ * [TabBar] Switch tabs with mouse wheel
+ * Fix warning
+ * Control must not have children (kde#394134)
+ * constrain scroll (kde#393992)
+- Dropped patches, now upstream:
+ * control-must-not-have-children.patch
+
+-------------------------------------------------------------------
Old:
----
control-must-not-have-children.patch
qqc2-desktop-style-5.46.0.tar.xz
New:
----
qqc2-desktop-style-5.47.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qqc2-desktop-style.spec ++++++
--- /var/tmp/diff_new_pack.FRUYQn/_old 2018-06-23 19:59:12.691579245 +0200
+++ /var/tmp/diff_new_pack.FRUYQn/_new 2018-06-23 19:59:12.695579097 +0200
@@ -16,9 +16,9 @@
#
-%define _tar_path 5.46
+%define _tar_path 5.47
Name: qqc2-desktop-style
-Version: 5.46.0
+Version: 5.47.0
Release: 0
Summary: A Qt Quick Controls 2 Style for Desktop UIs
License: GPL-2.0-or-later
@@ -27,8 +27,6 @@
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
@@ -72,7 +70,6 @@
%if 0%{?suse_version} < 1500
%patch -p1
%endif
-%patch1 -p1
%build
%cmake_kf5 -d build
++++++ qqc2-desktop-style-5.46.0.tar.xz -> qqc2-desktop-style-5.47.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/CMakeLists.txt
new/qqc2-desktop-style-5.47.0/CMakeLists.txt
--- old/qqc2-desktop-style-5.46.0/CMakeLists.txt 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/CMakeLists.txt 2018-06-02
18:30:33.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.0)
-set(KF5_VERSION "5.46.0") # handled by release scripts
-set(KF5_DEP_VERSION "5.46.0") # handled by release scripts
+set(KF5_VERSION "5.47.0") # handled by release scripts
+set(KF5_DEP_VERSION "5.47.0") # handled by release scripts
project(qqc2-desktop-style VERSION ${KF5_VERSION})
@@ -21,7 +21,7 @@
################# set KDE specific information #################
-find_package(ECM 5.46.0 REQUIRED NO_MODULE)
+find_package(ECM 5.47.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})
@@ -105,6 +105,12 @@
set(DISABLE_UNDER_QQC2_2_3 "")
endif()
+if (QQC2_VERSION_MINOR LESS 4)
+ set(DISABLE_UNDER_QQC2_2_4 "//Needs QtQuick.Controls 2.4 ")
+else()
+ set(DISABLE_UNDER_QQC2_2_4 "")
+endif()
+
# Find all the source qml files
FILE(GLOB_RECURSE inFiles RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
"${CMAKE_CURRENT_SOURCE_DIR}/org.kde.desktop/*")
@@ -116,6 +122,7 @@
"${CMAKE_CURRENT_BINARY_DIR}/${infileName}"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
PATH_VARS QQC2_VERSION DISABLE_UNDER_QQC2_2_3
+ DISABLE_UNDER_QQC2_2_4
)
ENDFOREACH(infileName)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
new/qqc2-desktop-style-5.47.0/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
---
old/qqc2-desktop-style-5.46.0/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
2018-05-05 14:40:14.000000000 +0200
+++
new/qqc2-desktop-style-5.47.0/kirigami-plasmadesktop-integration/kirigamiplasmafactory.h
2018-06-02 18:30:33.000000000 +0200
@@ -35,7 +35,7 @@
explicit KirigamiPlasmaFactory(QObject *parent = nullptr);
~KirigamiPlasmaFactory() override;
- Kirigami::PlatformTheme *createPlatformTheme(QObject *parent)
Q_DECL_OVERRIDE;
+ Kirigami::PlatformTheme *createPlatformTheme(QObject *parent) override;
};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
new/qqc2-desktop-style-5.47.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
---
old/qqc2-desktop-style-5.46.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2018-05-05 14:40:14.000000000 +0200
+++
new/qqc2-desktop-style-5.47.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h
2018-06-02 18:30:33.000000000 +0200
@@ -49,7 +49,7 @@
explicit PlasmaDesktopTheme(QObject *parent = nullptr);
~PlasmaDesktopTheme() override;
- Q_INVOKABLE QIcon iconFromTheme(const QString &name, const QColor
&customColor = Qt::transparent) Q_DECL_OVERRIDE;
+ Q_INVOKABLE QIcon iconFromTheme(const QString &name, const QColor
&customColor = Qt::transparent) override;
void syncColors();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/BusyIndicator.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/BusyIndicator.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/BusyIndicator.qml
2018-06-02 18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.BusyIndicator {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Button.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Button.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Button.qml 2018-06-02
18:30:33.000000000 +0200
@@ -26,6 +26,8 @@
T.Button {
id: controlRoot
+
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/CheckBox.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/CheckBox.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckBox.qml 2018-06-02
18:30:33.000000000 +0200
@@ -24,10 +24,12 @@
import QtQuick.Templates @QQC2_VERSION@ as T
import QtQuick.Controls @QQC2_VERSION@
import org.kde.kirigami 2.3 as Kirigami
+import "private"
T.CheckBox {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding +
rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
@@ -36,7 +38,6 @@
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 1
- spacing: Kirigami.Units.smallSpacing
hoverEnabled: true
@@ -70,5 +71,9 @@
visible: controlRoot.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
+
+ FocusRect {
+ control: controlRoot
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/CheckDelegate.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/CheckDelegate.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/CheckDelegate.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.CheckDelegate {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ComboBox.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ComboBox.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ComboBox.qml 2018-06-02
18:30:33.000000000 +0200
@@ -30,6 +30,7 @@
T.ComboBox {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
//NOTE: typeof necessary to not have warnings on Qt 5.7
Kirigami.Theme.colorSet: typeof(editable) != "undefined" && editable ?
Kirigami.Theme.View : Kirigami.Theme.Button
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/Container.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Container.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Container.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Container.qml 2018-06-02
18:30:33.000000000 +0200
@@ -22,10 +22,12 @@
import QtQuick 2.6
import QtQuick.Templates @QQC2_VERSION@ as T
+import org.kde.kirigami 2.4 as Kirigami
T.Container {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
(contentItem ? contentItem.implicitWidth : 0) +
leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/Control.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Control.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Control.qml 2018-06-02
18:30:33.000000000 +0200
@@ -23,10 +23,12 @@
import QtQuick 2.6
import QtQuick.Templates @QQC2_VERSION@ as T
import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
+import org.kde.kirigami 2.3 as Kirigami
T.Control {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
(contentItem ? contentItem.implicitWidth : 0) +
leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
@@ -37,7 +39,7 @@
rightPadding: styleItem.pixelMetric("layoutrightmargin")
bottomPadding: styleItem.pixelMetric("layoutbottommargin")
- StylePrivate.StyleItem {
+ property Item __style: StylePrivate.StyleItem {
id: styleItem
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/DelayButton.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/DelayButton.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/DelayButton.qml
2018-06-02 18:30:33.000000000 +0200
@@ -26,6 +26,8 @@
T.DelayButton {
id: controlRoot
+
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Dial.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Dial.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Dial.qml 2018-06-02
18:30:33.000000000 +0200
@@ -29,6 +29,7 @@
T.Dial {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: 128
implicitHeight: 128
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Dialog.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Dialog.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Dialog.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.Dialog {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentWidth > 0 ? contentWidth + leftPadding +
rightPadding : 0)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/DialogButtonBox.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/DialogButtonBox.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/DialogButtonBox.qml
2018-06-02 18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.DialogButtonBox {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Drawer.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Drawer.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Drawer.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.Drawer {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
parent: T.ApplicationWindow.overlay
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentWidth + leftPadding + rightPadding)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Frame.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Frame.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Frame.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.Frame {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentWidth + leftPadding + rightPadding
implicitHeight: contentHeight + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/GroupBox.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/GroupBox.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/GroupBox.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.GroupBox {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentWidth + leftPadding + rightPadding
implicitHeight: contentHeight + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ItemDelegate.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ItemDelegate.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ItemDelegate.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.ItemDelegate {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Label.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Label.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Label.qml 2018-06-02
18:30:33.000000000 +0200
@@ -29,6 +29,7 @@
T.Label {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
verticalAlignment: lineCount > 1 ? Text.AlignTop : Text.AlignVCenter
activeFocusOnTab: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Menu.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Menu.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Menu.qml 2018-06-02
18:30:33.000000000 +0200
@@ -30,6 +30,7 @@
T.Menu {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem ? contentItem.implicitWidth +
leftPadding + rightPadding : 0)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/MenuBarItem.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/MenuBarItem.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuBarItem.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.MenuBarItem {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding
baselineOffset: contentItem.y + contentItem.baselineOffset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/MenuItem.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/MenuItem.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/MenuItem.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.MenuItem {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding +
rightPadding)
implicitHeight: visible ? Math.max(background ? background.implicitHeight
: 0,
@@ -57,11 +58,11 @@
contentItem: RowLayout {
Item {
- Layout.preferredWidth: controlRoot.ListView.view.hasCheckables ||
controlRoot.checkable ? controlRoot.indicator.width :
Kirigami.Units.smallSpacing
+ Layout.preferredWidth: (controlRoot.ListView.view &&
controlRoot.ListView.view.hasCheckables) || controlRoot.checkable ?
controlRoot.indicator.width : Kirigami.Units.smallSpacing
}
Kirigami.Icon {
Layout.alignment: Qt.AlignVCenter
- visible: controlRoot.ListView.view.hasIcons || (controlRoot.icon
!= undefined && (controlRoot.icon.name.length > 0 ||
controlRoot.icon.source.length > 0))
+ visible: (controlRoot.ListView.view &&
controlRoot.ListView.view.hasIcons) || (controlRoot.icon != undefined &&
(controlRoot.icon.name.length > 0 || controlRoot.icon.source.length > 0))
source: controlRoot.icon ? (controlRoot.icon.name ||
controlRoot.icon.source) : ""
color: controlRoot.icon ? controlRoot.icon.color : "transparent"
//hovered is for retrocompatibility
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Popup.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Popup.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Popup.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.Popup {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentWidth > 0 ? contentWidth + leftPadding +
rightPadding : 0)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ProgressBar.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ProgressBar.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ProgressBar.qml
2018-06-02 18:30:33.000000000 +0200
@@ -23,10 +23,12 @@
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.3 as Kirigami
T.ProgressBar {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: 250
implicitHeight: 22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/RadioButton.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/RadioButton.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioButton.qml
2018-06-02 18:30:33.000000000 +0200
@@ -24,10 +24,12 @@
import QtQuick.Templates @QQC2_VERSION@ as T
import QtQuick.Controls @QQC2_VERSION@
import org.kde.kirigami 2.3 as Kirigami
+import "private"
T.RadioButton {
- id: control
+ id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding +
rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
@@ -36,39 +38,42 @@
baselineOffset: contentItem.y + contentItem.baselineOffset
padding: 1
- spacing: Kirigami.Units.smallSpacing
hoverEnabled: true
indicator: RadioIndicator {
- LayoutMirroring.enabled: control.mirrored
+ LayoutMirroring.enabled: controlRoot.mirrored
LayoutMirroring.childrenInherit: true
anchors {
left: parent.left
verticalCenter: parent.verticalCenter
}
- control: control
+ control: controlRoot
}
- Kirigami.MnemonicData.enabled: control.enabled && control.visible
+ Kirigami.MnemonicData.enabled: controlRoot.enabled && controlRoot.visible
Kirigami.MnemonicData.controlType: Kirigami.MnemonicData.ActionElement
- Kirigami.MnemonicData.label: control.text
+ Kirigami.MnemonicData.label: controlRoot.text
Shortcut {
//in case of explicit & the button manages it by itself
- enabled: !(RegExp(/\&[^\&]/).test(control.text))
- sequence: control.Kirigami.MnemonicData.sequence
- onActivated: control.checked = true
+ enabled: !(RegExp(/\&[^\&]/).test(controlRoot.text))
+ sequence: controlRoot.Kirigami.MnemonicData.sequence
+ onActivated: controlRoot.checked = true
}
+
contentItem: Label {
- 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
- text: control.Kirigami.MnemonicData.richTextLabel
- font: control.font
- color: Kirigami.Theme.textColor
+ leftPadding: controlRoot.indicator && !controlRoot.mirrored ?
controlRoot.indicator.width + controlRoot.spacing : 0
+ rightPadding: controlRoot.indicator && controlRoot.mirrored ?
controlRoot.indicator.width + controlRoot.spacing : 0
+ opacity: controlRoot.enabled ? 1 : 0.6
+ text: controlRoot.Kirigami.MnemonicData.richTextLabel
+ font: controlRoot.font
elide: Text.ElideRight
- visible: control.text
+ visible: controlRoot.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
+
+ FocusRect {
+ control: controlRoot
+ }
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/RadioDelegate.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/RadioDelegate.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/RadioDelegate.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.RadioDelegate {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/RangeSlider.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/RangeSlider.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/RangeSlider.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.RangeSlider {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
Math.max(first.handle ? first.handle.implicitWidth : 0,
second.handle ? second.handle.implicitWidth : 0) +
leftPadding + rightPadding)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/RoundButton.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/RoundButton.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/RoundButton.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.RoundButton {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: controlRoot.activeFocus ?
Kirigami.Theme.Selection : Kirigami.Theme.Button
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollBar.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollBar.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollBar.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,12 +28,14 @@
T.ScrollBar {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: background.implicitWidth
implicitHeight: background.implicitHeight
hoverEnabled: true
visible: controlRoot.size < 1.0
+ stepSize: 0.02
background: MouseArea {
id: mouseArea
@@ -45,11 +47,11 @@
onExited: style.activeControl = "groove";
onPressed: {
if (style.activeControl == "down") {
- buttonTimer.increment = 0.02;
+ buttonTimer.increment = 1;
buttonTimer.running = true;
mouse.accepted = true
} else if (style.activeControl == "up") {
- buttonTimer.increment = -0.02;
+ buttonTimer.increment = -1;
buttonTimer.running = true;
mouse.accepted = true
} else {
@@ -88,7 +90,11 @@
repeat: true
interval: 150
onTriggered: {
- controlRoot.position += increment;
+ if (increment > 0) {
+ controlRoot.increase();
+ } else {
+ controlRoot.decrease();
+ }
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollView.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ScrollView.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ScrollView.qml
2018-06-02 18:30:33.000000000 +0200
@@ -31,6 +31,7 @@
clip: true
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentHeight + topPadding + bottomPadding)
@@ -47,12 +48,6 @@
}
}
- onChildrenChanged: {
- if (controlRoot.children[controlRoot.children.length -
1].hasOwnProperty("contentY")) {
- scrollHelper.flickableItem =
controlRoot.children[controlRoot.children.length - 1];
- }
- }
-
children: [
MouseArea {
id: scrollHelper
@@ -62,12 +57,12 @@
onIsMobileChanged: {
flickableItem.boundsBehavior = scrollHelper.isMobile ?
Flickable.DragAndOvershootBounds : Flickable.StopAtBounds;
}
- property Flickable flickableItem
+ readonly property Flickable flickableItem: controlRoot.contentItem
+
onFlickableItemChanged: {
- flickableItem.parent = scrollHelper;
- flickableItem.boundsBehavior = scrollHelper.isMobile ?
Flickable.DragAndOvershootBounds : Flickable.StopAtBounds;
- flickableItem.anchors.fill = scrollHelper;
+ flickableItem.boundsBehavior = scrollHelper.isMobile ?
Flickable.DragAndOvershootBounds : Flickable.StopAtBounds;
+
//don't make the scrolling items overlap the background
borders.
flickableItem.anchors.margins = Qt.binding(function() { return
controlRoot.background && controlRoot.background.visible ? 2 : 0; });
flickableItem.clip = true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Slider.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Slider.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Slider.qml 2018-06-02
18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.Slider {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.Button
implicitWidth: background.implicitWidth
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/SpinBox.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/SpinBox.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/SpinBox.qml 2018-06-02
18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.SpinBox {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/Switch.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/Switch.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/Switch.qml 2018-06-02
18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.CheckBox {
id: control
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/SwitchDelegate.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/SwitchDelegate.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchDelegate.qml
2018-06-02 18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.SwitchDelegate {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding
implicitHeight: Math.max(contentItem.implicitHeight,
indicator ? indicator.implicitHeight :
0) + topPadding + bottomPadding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/SwitchIndicator.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchIndicator.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/SwitchIndicator.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/SwitchIndicator.qml
2018-06-02 18:30:33.000000000 +0200
@@ -25,6 +25,7 @@
Item {
property alias control: slider.control
+
implicitWidth: 32
implicitHeight : 22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/org.kde.desktop/TabBar.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/TabBar.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/TabBar.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,12 +28,13 @@
T.TabBar {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.Button
Kirigami.Theme.inherit: false
//Some QStyles seem to not return sensible pixelmetrics here
implicitWidth: Math.max(Kirigami.Units.gridUnit * 6,
contentItem.implicitWidth)
- implicitHeight: Math.max(Kirigami.Units.gridUnit * 2,
contentItem.implicitHeight)
+ implicitHeight: contentItem.implicitHeight
spacing: 0
@@ -66,7 +67,16 @@
}
}
- background: Item {
+ background: MouseArea {
+ acceptedButtons: Qt.NoButton
+ onWheel: {
+ if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) {
+ controlRoot.currentIndex = Math.min(controlRoot.currentIndex +
1, controlRoot.contentModel.count -1);
+ } else {
+ controlRoot.currentIndex = Math.max(controlRoot.currentIndex -
1, 0);
+ }
+ }
+
Rectangle {
anchors {
left: parent.left
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/TabButton.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/TabButton.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/TabButton.qml 2018-06-02
18:30:33.000000000 +0200
@@ -31,6 +31,7 @@
T.TabButton {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
//Some qstyles like fusion don't have correct pixel metrics here and just
return 0
implicitWidth: Math.max(styleitem.implicitWidth, textMetrics.width +
Kirigami.Units.gridUnit * 2)
implicitHeight: styleitem.implicitHeight || Kirigami.Units.gridUnit * 2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/TextArea.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/TextArea.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/TextArea.qml 2018-06-02
18:30:33.000000000 +0200
@@ -28,6 +28,7 @@
T.TextArea {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false
@@ -70,7 +71,6 @@
background: StylePrivate.StyleItem {
id: style
control: controlRoot
- visible: controlRoot.backgroundVisible
elementType: "edit"
implicitWidth: 200
implicitHeight: 22
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/TextField.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/TextField.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/TextField.qml 2018-06-02
18:30:33.000000000 +0200
@@ -29,6 +29,7 @@
T.TextField {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.View
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolBar.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolBar.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolBar.qml 2018-06-02
18:30:33.000000000 +0200
@@ -27,6 +27,7 @@
T.ToolBar {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentWidth + leftPadding + rightPadding)
implicitHeight: Math.max(background ? background.implicitHeight : 0,
contentHeight + topPadding + bottomPadding)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolButton.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolButton.qml
2018-05-05 14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolButton.qml
2018-06-02 18:30:33.000000000 +0200
@@ -27,6 +27,8 @@
T.ToolButton {
id: controlRoot
+
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: flat ? Kirigami.Theme.Window :
Kirigami.Theme.Button
Kirigami.Theme.inherit: flat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolTip.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/ToolTip.qml 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/ToolTip.qml 2018-06-02
18:30:33.000000000 +0200
@@ -29,6 +29,7 @@
T.ToolTip {
id: controlRoot
+ @DISABLE_UNDER_QQC2_2_4@ palette: Kirigami.Theme.palette
Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip
Kirigami.Theme.inherit: false
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/qqc2-desktop-style-5.46.0/org.kde.desktop/private/FocusRect.qml
new/qqc2-desktop-style-5.47.0/org.kde.desktop/private/FocusRect.qml
--- old/qqc2-desktop-style-5.46.0/org.kde.desktop/private/FocusRect.qml
1970-01-01 01:00:00.000000000 +0100
+++ new/qqc2-desktop-style-5.47.0/org.kde.desktop/private/FocusRect.qml
2018-06-02 18:30:33.000000000 +0200
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2018 Kai Uwe Broulik <[email protected]>
+ * Copyright 2017 The Qt Company Ltd.
+ *
+ * GNU Lesser General Public License Usage
+ * Alternatively, this file may be used under the terms of the GNU Lesser
+ * General Public License version 3 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.LGPLv3 included in the
+ * packaging of this file. Please review the following information to
+ * ensure the GNU Lesser General Public License version 3 requirements
+ * will be met: https://www.gnu.org/licenses/lgpl.html.
+ *
+ * GNU General Public License Usage
+ * Alternatively, this file may be used under the terms of the GNU
+ * General Public License version 2.0 or later as published by the Free
+ * Software Foundation and appearing in the file LICENSE.GPL included in
+ * the packaging of this file. Please review the following information to
+ * ensure the GNU General Public License version 2.0 requirements will be
+ * met: http://www.gnu.org/licenses/gpl-2.0.html.
+ */
+
+
+import QtQuick 2.6
+import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate
+
+StylePrivate.StyleItem {
+ elementType: "focusrect"
+ // those random numbers come from QQC1 desktop style
+ anchors {
+ top: parent.top
+ bottom: parent.bottom
+ topMargin: parent.topPadding - 1
+ bottomMargin: parent.bottomPadding - 1
+ }
+ // this is explicitly not using left anchor for auto mirroring
+ // since the label's leftPadding/rightPadding already accounts for that
+ x: parent.leftPadding - 2
+ width: parent.implicitWidth - parent.leftPadding - parent.rightPadding + 3
+ visible: control.activeFocus
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/plugin/kquickstyleitem.cpp
new/qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp
--- old/qqc2-desktop-style-5.46.0/plugin/kquickstyleitem.cpp 2018-05-05
14:40:14.000000000 +0200
+++ new/qqc2-desktop-style-5.47.0/plugin/kquickstyleitem.cpp 2018-06-02
18:30:33.000000000 +0200
@@ -712,7 +712,12 @@
if (QCoreApplication::testAttribute(Qt::AA_SetPalette))
return;
- m_styleoption->palette = m_theme->palette();
+ const QVariant controlPalette = m_control ? m_control->property("palette")
: QVariant();
+ if (controlPalette.isValid()) {
+ m_styleoption->palette = controlPalette.value<QPalette>();
+ } else {
+ m_styleoption->palette = m_theme->palette();
+ }
}
/*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/tests/scrollView.qml
new/qqc2-desktop-style-5.47.0/tests/scrollView.qml
--- old/qqc2-desktop-style-5.46.0/tests/scrollView.qml 1970-01-01
01:00:00.000000000 +0100
+++ new/qqc2-desktop-style-5.47.0/tests/scrollView.qml 2018-06-02
18:30:33.000000000 +0200
@@ -0,0 +1,13 @@
+import QtQuick 2.3
+import QtQuick.Controls 2.3
+
+ScrollView {
+ height: 100
+ width: 300
+ ListView {
+ model: 100
+ delegate: Text {
+ text: modelData
+ }
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/qqc2-desktop-style-5.46.0/tests/testScrollView.qml
new/qqc2-desktop-style-5.47.0/tests/testScrollView.qml
--- old/qqc2-desktop-style-5.46.0/tests/testScrollView.qml 1970-01-01
01:00:00.000000000 +0100
+++ new/qqc2-desktop-style-5.47.0/tests/testScrollView.qml 2018-06-02
18:30:33.000000000 +0200
@@ -0,0 +1,31 @@
+import QtQuick 2.3
+import QtQuick.Layouts 1.3
+import QtQuick.Controls 2.3
+
+ApplicationWindow
+{
+ visible: true
+ RowLayout {
+ anchors.fill: parent
+ ScrollView {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ Layout.minimumWidth: parent.width/2
+ TextArea {
+ text: "Lorem ipsum dolor sit amet, consectetur adipiscing
elit. Curabitur ultricies consequat nulla, ut vulputate nulla ultricies ac.
Suspendisse lacinia commodo lacus, non tristique mauris dictum vitae. Sed
adipiscing augue nec nisi aliquet viverra. Etiam sit amet nulla in tellus
consectetur feugiat. Cras in sem tortor. Fusce a nulla at justo accumsan
gravida. Maecenas dui felis, lacinia at ornare sed, aliquam et purus. Sed ut
sagittis lacus. Etiam dictum pharetra rhoncus. Suspendisse auctor orci ipsum.
Pellentesque vitae urna nec felis consequat lobortis dictum in urna. Phasellus
a mi ac leo adipiscing varius eget a felis. Cras magna augue, commodo sed
placerat vel, tempus vel ligula. In feugiat quam quis est lobortis sed accumsan
nunc malesuada. Mauris quis massa sit amet felis tempus suscipit a quis
diam.\n\n" + "Aenean quis nulla erat, vel sagittis sem. Praesent vitae mauris
arcu. Cras porttitor, ante at scelerisque sodales, nibh felis consectetur orci,
ut hendrerit urna urna non urna. Duis eu magna id mi scelerisque adipiscing.
Aliquam sed quam in eros sodales accumsan. Phasellus tempus sagittis suscipit.
Aliquam rutrum dictum justo ut viverra. Nulla felis sem, molestie sed
scelerisque non, consequat vitae nulla. Aliquam ullamcorper malesuada mi, vel
vestibulum magna vulputate eget. In hac habitasse platea dictumst. Cras sed
lacus dui, vel semper sem. Aenean sodales porta leo vel fringilla.\n\n" + "Ut
tempus massa et urna porta non mollis metus ultricies. Duis nec nulla ac metus
auctor porta id et mi. Mauris aliquam nibh a ligula malesuada sed tincidunt
nibh varius. Sed felis metus, porta et adipiscing non, faucibus id leo. Donec
ipsum nibh, hendrerit eget aliquam nec, tempor ut mauris. Suspendisse potenti.
Vestibulum scelerisque adipiscing libero tristique eleifend. Donec quis tortor
eget elit mollis iaculis ac sit amet nisi. Proin non massa sed nunc rutrum
pellentesque. Sed dui lectus, laoreet sed condimentum id, commodo sed
urna.\n\n" + "Praesent tincidunt mattis massa mattis porta. Nullam posuere
neque at mauris vestibulum vitae elementum leo sodales. Quisque condimentum
lectus in libero luctus egestas. Fusce tempor neque ac dui tincidunt eget
viverra quam suscipit. In hac habitasse platea dictumst. Etiam metus mi,
adipiscing nec suscipit id, aliquet sed sem. Duis urna ligula, ornare sed
vestibulum vel, molestie ac nisi. Morbi varius iaculis ligula. Nunc in augue
leo, sit amet aliquam elit. Suspendisse rutrum sem diam. Proin eu orci nisl.
Praesent porttitor dignissim est, id fermentum arcu venenatis vitae.\n\n" +
"Integer in sapien eget quam vulputate lobortis. Morbi nibh elit, elementum
vitae vehicula sed, consequat nec erat. Donec placerat porttitor est ut
dapibus. Fusce augue orci, dictum et convallis vel, blandit eu tortor.
Phasellus non eros nulla. In iaculis nulla fermentum nulla gravida eu mattis
purus consectetur. Integer dui nunc, sollicitudin ac tincidunt nec, hendrerit
bibendum nunc. Proin sit amet augue ac velit egestas varius. Sed eu ante quis
orci vestibulum sagittis. Class aptent taciti sociosqu ad litora torquent per
conubia nostra, per inceptos himenaeos. Phasellus vitae urna odio, at molestie
leo. In convallis neque vel mi dictum convallis lobortis turpis sagittis.\n\n"
+ }
+ }
+ ScrollView {
+ Layout.fillWidth: true
+ Layout.fillHeight: true
+ Layout.minimumWidth: parent.width / 2
+ ListView {
+ model: 100
+ delegate: ItemDelegate {
+ text: modelData
+ width: parent.width
+ }
+ }
+ }
+ }
+}
