Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2019-02-15 10:01:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Fri Feb 15 10:01:49 2019 rev:18 rq:674282 version:5.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2019-01-24 14:10:24.799570078 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28833/qqc2-desktop-style.changes 2019-02-15 10:01:57.351634373 +0100 @@ -1,0 +2,23 @@ +Sun Feb 10 22:03:24 UTC 2019 - [email protected] + +- Update to 5.55.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.55.0.php +- Changes since 5.54.0: + * Fix combobox initial sizing (kde#403736) + * Set combobox popups to be modal (kde#403403) + * Tab bar test + * partly revert 4f00b0cabc1230fdf + * Word-wrap long tooltips (kde#396385) + * ComboBox: fix default delegate + * Fake mousehover whilst combobox is open + * Set CombooBox QStyleOptionState == On rather than Sunken to match qwidgets + * Fix ComboBox + * Always draw the tooltip on top of everything else + * Support a tooltip on a MouseArea + * Minor: Use {} for initializing flags + * Minor: Use nullptr + * do not force text display for ToolButton + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.54.0.tar.xz New: ---- qqc2-desktop-style-5.55.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.x9YChl/_old 2019-02-15 10:01:57.883634201 +0100 +++ /var/tmp/diff_new_pack.x9YChl/_new 2019-02-15 10:01:57.887634200 +0100 @@ -16,9 +16,9 @@ # -%define _tar_path 5.54 +%define _tar_path 5.55 Name: qqc2-desktop-style -Version: 5.54.0 +Version: 5.55.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.54.0.tar.xz -> qqc2-desktop-style-5.55.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.54.0/CMakeLists.txt new/qqc2-desktop-style-5.55.0/CMakeLists.txt --- old/qqc2-desktop-style-5.54.0/CMakeLists.txt 2019-01-04 22:45:42.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/CMakeLists.txt 2019-02-02 18:25:15.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.54.0") # handled by release scripts -set(KF5_DEP_VERSION "5.54.0") # handled by release scripts +set(KF5_VERSION "5.55.0") # handled by release scripts +set(KF5_DEP_VERSION "5.55.0") # handled by release scripts project(qqc2-desktop-style VERSION ${KF5_VERSION}) -set(REQUIRED_QT_VERSION 5.9.0) +set(REQUIRED_QT_VERSION 5.10.0) ################# Disallow in-source build ################# @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.54.0 REQUIRED NO_MODULE) +find_package(ECM 5.55.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.54.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.55.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.54.0/org.kde.desktop/ComboBox.qml 2019-01-04 22:45:42.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/org.kde.desktop/ComboBox.qml 2019-02-02 18:25:15.000000000 +0100 @@ -53,6 +53,10 @@ property bool separatorVisible: false Kirigami.Theme.colorSet: controlRoot.Kirigami.Theme.inherit ? controlRoot.Kirigami.Theme.colorSet : Kirigami.Theme.View Kirigami.Theme.inherit: controlRoot.Kirigami.Theme.inherit + onClicked: { + controlRoot.currentIndex = index; + controlRoot.popup.visible = false; + } } indicator: Item {} @@ -134,7 +138,7 @@ selectedTextColor: Kirigami.Theme.highlightedTextColor selectByMouse: !Kirigami.Settings.tabletMode - cursorDelegate: Kirigami.Settings.tabletMode ? mobileCursor : undefined + cursorDelegate: Kirigami.Settings.tabletMode ? mobileCursor : null font: controlRoot.font horizontalAlignment: Text.AlignLeft @@ -178,9 +182,8 @@ control: controlRoot elementType: "combobox" anchors.fill: parent - hover: controlRoot.hovered - sunken: controlRoot.pressed - raised: !sunken + hover: controlRoot.hovered || controlRoot.pressed + on: controlRoot.pressed hasFocus: controlRoot.activeFocus enabled: controlRoot.enabled // contentHeight as in QComboBox magic numbers taken from QQC1 style @@ -199,12 +202,19 @@ bottomMargin: 6 Kirigami.Theme.colorSet: Kirigami.Theme.View Kirigami.Theme.inherit: controlRoot.Kirigami.Theme.inherit + modal: true contentItem: ListView { id: listView - clip: true + + // 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.popup.visible ? controlRoot.delegateModel : null + model: controlRoot.delegateModel + delegate: controlRoot.delegate currentIndex: controlRoot.highlightedIndex highlightRangeMode: ListView.ApplyRange highlightMoveDuration: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.54.0/org.kde.desktop/ToolTip.qml new/qqc2-desktop-style-5.55.0/org.kde.desktop/ToolTip.qml --- old/qqc2-desktop-style-5.54.0/org.kde.desktop/ToolTip.qml 2019-01-04 22:45:42.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/org.kde.desktop/ToolTip.qml 2019-02-02 18:25:15.000000000 +0100 @@ -36,13 +36,16 @@ x: parent ? (parent.width - implicitWidth) / 2 : 0 y: -implicitHeight - 3 + // Always show the tooltip on top of everything else + z: 999 + implicitWidth: contentItem.implicitWidth + leftPadding + rightPadding implicitHeight: contentItem.implicitHeight + topPadding + bottomPadding margins: 6 padding: 6 - visible: Kirigami.Settings.tabletMode ? parent.pressed : parent.hovered + visible: parent && (Kirigami.Settings.tabletMode ? parent.pressed : (parent.hasOwnProperty("hovered") ? parent.hovered : parent.containsMouse)) delay: Kirigami.Settings.tabletMode ? Qt.styleHints.mousePressAndHoldInterval : 1000 timeout: 5000 @@ -50,6 +53,7 @@ contentItem: Controls.Label { text: controlRoot.text + wrapMode: Text.WordWrap font: controlRoot.font Kirigami.Theme.colorSet: Kirigami.Theme.Tooltip color: Kirigami.Theme.textColor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.54.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.55.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.54.0/plugin/kquickstyleitem.cpp 2019-01-04 22:45:42.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/plugin/kquickstyleitem.cpp 2019-02-02 18:25:15.000000000 +0100 @@ -192,7 +192,7 @@ Q_ASSERT(m_theme); if (m_styleoption) - m_styleoption->state = 0; + m_styleoption->state = {}; QString sizeHint = m_hints.value(QStringLiteral("size")).toString(); @@ -242,7 +242,7 @@ m_styleoption = new QStyleOptionViewItem(); QStyleOptionViewItem *opt = qstyleoption_cast<QStyleOptionViewItem*>(m_styleoption); - opt->features = 0; + opt->features = {}; if (activeControl() == QLatin1String("alternate")) opt->features |= QStyleOptionViewItem::Alternate; } @@ -335,8 +335,7 @@ opt->features = QStyleOptionToolButton::HasMenu; } - // For now both text and icon - opt->toolButtonStyle = Qt::ToolButtonTextBesideIcon; + opt->toolButtonStyle = Qt::ToolButtonFollowStyle; int e = KQuickStyleItem::style()->pixelMetric(QStyle::PM_ToolBarIconSize, m_styleoption, nullptr); opt->iconSize = QSize(e, e); @@ -542,7 +541,7 @@ else if (value() & (1<<1)) opt->activeSubControls = QStyle::SC_SpinBoxDown; opt->subControls = QStyle::SC_All; - opt->stepEnabled = 0; + opt->stepEnabled = {}; if (value() & (1<<2)) opt->stepEnabled |= QAbstractSpinBox::StepUpEnabled; if (value() & (1<<3)) @@ -604,7 +603,7 @@ opt->text = text(); opt->lineWidth = KQuickStyleItem::style()->pixelMetric(QStyle::PM_DefaultFrameWidth, m_styleoption, nullptr); opt->subControls = QStyle::SC_GroupBoxLabel; - opt->features = 0; + opt->features = {}; if (m_properties[QStringLiteral("sunken")].toBool()) { // Qt draws an ugly line here so I ignore it opt->subControls |= QStyle::SC_GroupBoxFrame; } else { @@ -1612,7 +1611,7 @@ if (m_control) { m_control->removeEventFilter(this); - disconnect(m_control, 0, this, 0); + disconnect(m_control, nullptr, this, nullptr); } m_control = control; @@ -1720,7 +1719,7 @@ opt.state |= QStyle::State_Enabled; opt.rect = QRect(0, 0, width, height); QString style = QString::fromLatin1(KQuickStyleItem::style()->metaObject()->className()); - opt.features = 0; + opt.features = {}; if (id.contains(QLatin1String("selected"))) opt.state |= QStyle::State_Selected; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.54.0/tests/tabbar.qml new/qqc2-desktop-style-5.55.0/tests/tabbar.qml --- old/qqc2-desktop-style-5.54.0/tests/tabbar.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/tests/tabbar.qml 2019-02-02 18:25:15.000000000 +0100 @@ -0,0 +1,45 @@ +import QtQuick 2.5 +import QtQuick.Controls 2.3 +import QtQuick.Layouts 1.12 + +ColumnLayout { + anchors.fill: parent + anchors.margins: 20 + + spacing: 0 + + TabBar { + id: tabView + + TabButton { + text: "White" + } + TabButton { + text: "Green" + } + TabButton { + text: "Blue" + } + } + + Frame { + Layout.fillWidth: true + Layout.fillHeight: true + + StackLayout { //or SwipeView + clip for animated? + anchors.fill: parent + + currentIndex: tabView.currentIndex + + Rectangle { + color: "white" + } + Rectangle { + color: "Green" + } + Rectangle { + color: "Blue" + } + } + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.54.0/tests/testComboBox.qml new/qqc2-desktop-style-5.55.0/tests/testComboBox.qml --- old/qqc2-desktop-style-5.54.0/tests/testComboBox.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.55.0/tests/testComboBox.qml 2019-02-02 18:25:15.000000000 +0100 @@ -0,0 +1,29 @@ +import QtQuick 2.3 +import QtQuick.Layouts 1.3 +import QtQuick.Controls 2.3 + +ApplicationWindow +{ + visible: true + + ColumnLayout { + anchors.fill: parent + ComboBox { + Layout.fillWidth: true + textRole: "key" + model: ListModel { + id: comboModel + ListElement { key: "First"; value: 123 } + ListElement { key: "Second"; value: 456 } + ListElement { key: "Third"; value: 789 } + } + } + + ListView { + Layout.fillWidth: true + Layout.fillHeight: true + model: comboModel + delegate: Label { text: key } + } + } +}
