Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qqc2-desktop-style for openSUSE:Factory checked in at 2021-02-17 18:11:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qqc2-desktop-style (Old) and /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qqc2-desktop-style" Wed Feb 17 18:11:59 2021 rev:43 rq:871737 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/qqc2-desktop-style/qqc2-desktop-style.changes 2021-01-13 18:30:16.277711701 +0100 +++ /work/SRC/openSUSE:Factory/.qqc2-desktop-style.new.28504/qqc2-desktop-style.changes 2021-02-17 18:13:04.802016198 +0100 @@ -1,0 +2,13 @@ +Mon Feb 8 08:46:54 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.79.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.79.0 +- Changes since 5.78.0: + * [combobox] Fix touchpad scroll speed (kde#400258) + * qw can be null + * Support QQuickWidget (kde#428737) + * allow drag window from empty areas + +------------------------------------------------------------------- Old: ---- qqc2-desktop-style-5.78.0.tar.xz qqc2-desktop-style-5.78.0.tar.xz.sig New: ---- qqc2-desktop-style-5.79.0.tar.xz qqc2-desktop-style-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qqc2-desktop-style.spec ++++++ --- /var/tmp/diff_new_pack.Xx1fXA/_old 2021-02-17 18:13:05.326016627 +0100 +++ /var/tmp/diff_new_pack.Xx1fXA/_new 2021-02-17 18:13:05.330016630 +0100 @@ -16,11 +16,11 @@ # -%define _tar_path 5.78 +%define _tar_path 5.79 # Only needed for the package signature condition %bcond_without lang Name: qqc2-desktop-style -Version: 5.78.0 +Version: 5.79.0 Release: 0 Summary: A Qt Quick Controls 2 Style for Desktop UIs License: GPL-2.0-or-later ++++++ qqc2-desktop-style-5.78.0.tar.xz -> qqc2-desktop-style-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/.gitignore new/qqc2-desktop-style-5.79.0/.gitignore --- old/qqc2-desktop-style-5.78.0/.gitignore 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/.gitignore 2021-01-30 18:44:34.000000000 +0100 @@ -20,3 +20,4 @@ CMakeLists.txt.user* *.unc-backup* .cmake/ +/.clang-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/CMakeLists.txt new/qqc2-desktop-style-5.79.0/CMakeLists.txt --- old/qqc2-desktop-style-5.78.0/CMakeLists.txt 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/CMakeLists.txt 2021-01-30 18:44:34.000000000 +0100 @@ -1,9 +1,9 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.78.0") # handled by release scripts -set(KF5_DEP_VERSION "5.78.0") # handled by release scripts +set(KF_VERSION "5.79.0") # handled by release scripts +set(KF5_DEP_VERSION "5.79.0") # handled by release scripts -project(qqc2-desktop-style VERSION ${KF5_VERSION}) +project(qqc2-desktop-style VERSION ${KF_VERSION}) set(REQUIRED_QT_VERSION 5.14.0) @@ -21,7 +21,7 @@ ################# set KDE specific information ################# -find_package(ECM 5.78.0 REQUIRED NO_MODULE) +find_package(ECM 5.79.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}) @@ -68,7 +68,7 @@ "${CMAKE_CURRENT_SOURCE_DIR}/KF5QQC2DesktopStyleConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DesktopStyleConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX + PATH_VARS CMAKE_INSTALL_PREFIX ) install(FILES @@ -91,7 +91,7 @@ "${CMAKE_CURRENT_SOURCE_DIR}/KF5QQC2DeskopStyleConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5QQC2DeskopStyleConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} - PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX + PATH_VARS CMAKE_INSTALL_PREFIX ) install(FILES diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp new/qqc2-desktop-style-5.79.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp --- old/qqc2-desktop-style-5.78.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.cpp 2021-01-30 18:44:34.000000000 +0100 @@ -8,6 +8,7 @@ #include <QQmlEngine> #include <QQmlContext> #include <QGuiApplication> +#include <QQuickRenderControl> #include <QPalette> #include <QDebug> #include <QQuickWindow> @@ -151,23 +152,9 @@ if (m_parentItem) { connect(m_parentItem.data(), &QQuickItem::enabledChanged, this, &PlasmaDesktopTheme::syncColors); - if (m_parentItem && m_parentItem->window()) { - connect(m_parentItem->window(), &QWindow::activeChanged, - this, &PlasmaDesktopTheme::syncColors); - m_window = m_parentItem->window(); - } + syncWindow(); connect(m_parentItem.data(), &QQuickItem::windowChanged, - this, [this]() { - if (m_window) { - disconnect(m_window.data(), &QWindow::activeChanged, - this, &PlasmaDesktopTheme::syncColors); - } - if (m_parentItem && m_parentItem->window()) { - connect(m_parentItem->window(), &QWindow::activeChanged, - this, &PlasmaDesktopTheme::syncColors); - } - syncColors(); - }); + this, &PlasmaDesktopTheme::syncWindow); } //TODO: correct? depends from https://codereview.qt-project.org/206889 @@ -190,6 +177,35 @@ PlasmaDesktopTheme::~PlasmaDesktopTheme() = default; +void PlasmaDesktopTheme::syncWindow() +{ + if (m_window) { + disconnect(m_window.data(), &QWindow::activeChanged, + this, &PlasmaDesktopTheme::syncColors); + } + + QWindow *window = nullptr; + if (m_parentItem) { + QQuickWindow *qw = m_parentItem->window(); + + window = QQuickRenderControl::renderWindowFor(qw); + if (!window) { + window = qw; + } + if (qw) { + connect(qw, &QQuickWindow::sceneGraphInitialized, + this, &PlasmaDesktopTheme::syncWindow); + } + } + m_window = window; + + if (window) { + connect(m_window.data(), &QWindow::activeChanged, + this, &PlasmaDesktopTheme::syncColors); + syncColors(); + } +} + void PlasmaDesktopTheme::configurationChanged() { KSharedConfigPtr ptr = KSharedConfig::openConfig(); @@ -229,7 +245,7 @@ //in the case of QQuickWidget the window() will never be active //and the widgets will always have the inactive palette. // better to always show it active than always show it inactive - } else if (m_parentItem->window() && !m_parentItem->window()->isActive() && m_parentItem->window()->isExposed()) { + } else if (m_window && !m_window->isActive() && m_window->isExposed()) { group = QPalette::Inactive; } } @@ -275,7 +291,7 @@ m_viewHoverColor = (*s_style)->viewScheme.decoration(KColorScheme::HoverColor).color(); m_viewFocusColor = (*s_style)->viewScheme.decoration(KColorScheme::FocusColor).color(); - emit colorsChanged(); + Q_EMIT colorsChanged(); } QColor PlasmaDesktopTheme::buttonTextColor() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h new/qqc2-desktop-style-5.79.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h --- old/qqc2-desktop-style-5.78.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/kirigami-plasmadesktop-integration/plasmadesktoptheme.h 2021-01-30 18:44:34.000000000 +0100 @@ -38,6 +38,7 @@ Q_INVOKABLE QIcon iconFromTheme(const QString &name, const QColor &customColor = Qt::transparent) override; + void syncWindow(); void syncColors(); QColor buttonTextColor() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/org.kde.desktop/ComboBox.qml new/qqc2-desktop-style-5.79.0/org.kde.desktop/ComboBox.qml --- old/qqc2-desktop-style-5.78.0/org.kde.desktop/ComboBox.qml 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/org.kde.desktop/ComboBox.qml 2021-01-30 18:44:34.000000000 +0100 @@ -121,18 +121,29 @@ } MouseArea { + property int wheelDelta: 0 + anchors { fill: parent leftMargin: controlRoot.leftPadding rightMargin: controlRoot.rightPadding } + acceptedButtons: Qt.NoButton + onWheel: { - if (wheel.pixelDelta.y < 0 || wheel.angleDelta.y < 0) { - controlRoot.incrementCurrentIndex(); - } else { + var delta = wheel.angleDelta.y || wheel.angleDelta.x + wheelDelta += delta; + // magic number 120 for common "one click" + // See: https://doc.qt.io/qt-5/qml-qtquick-wheelevent.html#angleDelta-prop + while (wheelDelta >= 120) { + wheelDelta -= 120; controlRoot.decrementCurrentIndex(); } + while (wheelDelta <= -120) { + wheelDelta += 120; + controlRoot.incrementCurrentIndex(); + } } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/org.kde.desktop/Page.qml new/qqc2-desktop-style-5.79.0/org.kde.desktop/Page.qml --- old/qqc2-desktop-style-5.78.0/org.kde.desktop/Page.qml 1970-01-01 01:00:00.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/org.kde.desktop/Page.qml 2021-01-30 18:44:34.000000000 +0100 @@ -0,0 +1,34 @@ +/* + SPDX-FileCopyrightText: 2020 Marco Martin <[email protected]> + SPDX-FileCopyrightText: 2017 The Qt Company Ltd. + + SPDX-License-Identifier: LGPL-3.0-only OR GPL-2.0-or-later +*/ + +import QtQuick 2.12 +import QtQuick.Controls 2.12 +import QtQuick.Templates 2.12 as T +import org.kde.kirigami 2.14 as Kirigami +import org.kde.qqc2desktopstyle.private 1.0 as StylePrivate + +T.Page { + id: controlRoot + + implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset, + contentWidth + leftPadding + rightPadding, + implicitHeaderWidth, + implicitFooterWidth) + implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset, + contentHeight + topPadding + bottomPadding + + (implicitHeaderHeight > 0 ? implicitHeaderHeight + spacing : 0) + + (implicitFooterHeight > 0 ? implicitFooterHeight + spacing : 0)) + + background: Rectangle { + color: Kirigami.Theme.backgroundColor + } + readonly property Item __internal: StylePrivate.StyleItem { + parent: controlRoot + visible: false + control: controlRoot + } +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/plugin/kpropertywriter.cpp new/qqc2-desktop-style-5.79.0/plugin/kpropertywriter.cpp --- old/qqc2-desktop-style-5.78.0/plugin/kpropertywriter.cpp 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/plugin/kpropertywriter.cpp 2021-01-30 18:44:34.000000000 +0100 @@ -32,7 +32,7 @@ } m_target = target; - emit targetChanged(m_target); + Q_EMIT targetChanged(m_target); } void KPropertyWriter::setPropertyName(const QString &propertyName) @@ -42,7 +42,7 @@ } m_propertyName = propertyName; - emit propertyNameChanged(m_propertyName); + Q_EMIT propertyNameChanged(m_propertyName); } #include "moc_kpropertywriter_p.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/plugin/kquickpadding_p.h new/qqc2-desktop-style-5.79.0/plugin/kquickpadding_p.h --- old/qqc2-desktop-style-5.78.0/plugin/kquickpadding_p.h 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/plugin/kquickpadding_p.h 2021-01-30 18:44:34.000000000 +0100 @@ -41,10 +41,10 @@ int bottom() const { return m_bottom; } public Q_SLOTS: - void setLeft(int arg) { if (m_left != arg) {m_left = arg; emit leftChanged();}} - void setTop(int arg) { if (m_top != arg) {m_top = arg; emit topChanged();}} - void setRight(int arg) { if (m_right != arg) {m_right = arg; emit rightChanged();}} - void setBottom(int arg) {if (m_bottom != arg) {m_bottom = arg; emit bottomChanged();}} + void setLeft(int arg) { if (m_left != arg) {m_left = arg; Q_EMIT leftChanged();}} + void setTop(int arg) { if (m_top != arg) {m_top = arg; Q_EMIT topChanged();}} + void setRight(int arg) { if (m_right != arg) {m_right = arg; Q_EMIT rightChanged();}} + void setBottom(int arg) {if (m_bottom != arg) {m_bottom = arg; Q_EMIT bottomChanged();}} Q_SIGNALS: void leftChanged(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/plugin/kquickstyleitem.cpp new/qqc2-desktop-style-5.79.0/plugin/kquickstyleitem.cpp --- old/qqc2-desktop-style-5.78.0/plugin/kquickstyleitem.cpp 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/plugin/kquickstyleitem.cpp 2021-01-30 18:44:34.000000000 +0100 @@ -1158,7 +1158,7 @@ { if (m_contentWidth != arg) { m_contentWidth = arg; - emit contentWidthChanged(arg); + Q_EMIT contentWidthChanged(arg); } } @@ -1166,7 +1166,7 @@ { if (m_contentHeight != arg) { m_contentHeight = arg; - emit contentHeightChanged(arg); + Q_EMIT contentHeightChanged(arg); } } @@ -1289,12 +1289,12 @@ updateSizeHint(); if (m_styleoption->state & QStyle::State_Mini) { m_font.setPointSize(9.); - emit fontChanged(); + Q_EMIT fontChanged(); } else if (m_styleoption->state & QStyle::State_Small) { m_font.setPointSize(11.); - emit fontChanged(); + Q_EMIT fontChanged(); } else { - emit hintChanged(); + Q_EMIT hintChanged(); } } } @@ -1312,7 +1312,7 @@ m_type = str; - emit elementTypeChanged(); + Q_EMIT elementTypeChanged(); if (m_styleoption) { delete m_styleoption; m_styleoption = nullptr; @@ -1389,10 +1389,10 @@ } else { m_itemType = Undefined; } - emit leftPaddingChanged(); - emit rightPaddingChanged(); - emit topPaddingChanged(); - emit bottomPaddingChanged(); + Q_EMIT leftPaddingChanged(); + Q_EMIT rightPaddingChanged(); + Q_EMIT topPaddingChanged(); + Q_EMIT bottomPaddingChanged(); updateSizeHint(); } @@ -1724,7 +1724,7 @@ if (m_textureWidth == w) return; m_textureWidth = w; - emit textureWidthChanged(m_textureWidth); + Q_EMIT textureWidthChanged(m_textureWidth); update(); } @@ -1733,7 +1733,7 @@ if (m_textureHeight == h) return; m_textureHeight = h; - emit textureHeightChanged(m_textureHeight); + Q_EMIT textureHeightChanged(m_textureHeight); update(); } @@ -1774,7 +1774,7 @@ }); } - emit controlChanged(); + Q_EMIT controlChanged(); } QSGNode *KQuickStyleItem::updatePaintNode(QSGNode *node, UpdatePaintNodeData *) @@ -1831,6 +1831,14 @@ QFocusEvent *fe = static_cast<QFocusEvent *>(event); m_lastFocusReason = fe->reason(); } + // Page accepts mouse events without doing anything with them (for a workaround wrt dragging from empty areas of flickables) when the interaction is pure mouse, steal events from them, so a parent handler can initiate a window drag from empty areas, either Kirigami.ApplicationWindow or the breeze style from a QQwuickwidget + if (event->type() == QEvent::MouseButtonPress) { + QMouseEvent *me = static_cast<QMouseEvent *>(event); + if (me->source() == Qt::MouseEventNotSynthesized && watched->inherits("QQuickPage")) { + event->setAccepted(false); + return true; + } + } } else if (watched == m_window.data()) { if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) { QKeyEvent *ke = static_cast<QKeyEvent *>(event); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qqc2-desktop-style-5.78.0/plugin/kquickstyleitem_p.h new/qqc2-desktop-style-5.79.0/plugin/kquickstyleitem_p.h --- old/qqc2-desktop-style-5.78.0/plugin/kquickstyleitem_p.h 2021-01-02 13:36:10.000000000 +0100 +++ new/qqc2-desktop-style-5.79.0/plugin/kquickstyleitem_p.h 2021-01-30 18:44:34.000000000 +0100 @@ -152,25 +152,25 @@ QFont font() const { return m_font;} QString styleName() const; - void setSunken(bool sunken) { if (m_sunken != sunken) {m_sunken = sunken; emit sunkenChanged();}} - void setRaised(bool raised) { if (m_raised!= raised) {m_raised = raised; emit raisedChanged();}} - void setActive(bool active) { if (m_active!= active) {m_active = active; emit activeChanged();}} - void setSelected(bool selected) { if (m_selected!= selected) {m_selected = selected; emit selectedChanged();}} - void sethasFocus(bool focus) { if (m_focus != focus) {m_focus = focus; emit hasFocusChanged();}} - void setOn(bool on) { if (m_on != on) {m_on = on ; emit onChanged();}} - void setHover(bool hover) { if (m_hover != hover) {m_hover = hover ; emit hoverChanged();}} - void setHorizontal(bool horizontal) { if (m_horizontal != horizontal) {m_horizontal = horizontal; emit horizontalChanged();}} - void setTransient(bool transient) { if (m_transient != transient) {m_transient = transient; emit transientChanged();}} - void setMinimum(int minimum) { if (m_minimum!= minimum) {m_minimum = minimum; emit minimumChanged();}} - void setMaximum(int maximum) { if (m_maximum != maximum) {m_maximum = maximum; emit maximumChanged();}} - void setValue(int value) { if (m_value!= value) {m_value = value; emit valueChanged();}} - void setStep(int step) { if (m_step != step) { m_step = step; emit stepChanged(); }} - void setPaintMargins(int value) { if (m_paintMargins!= value) {m_paintMargins = value; emit paintMarginsChanged(); } } + void setSunken(bool sunken) { if (m_sunken != sunken) {m_sunken = sunken; Q_EMIT sunkenChanged();}} + void setRaised(bool raised) { if (m_raised!= raised) {m_raised = raised; Q_EMIT raisedChanged();}} + void setActive(bool active) { if (m_active!= active) {m_active = active; Q_EMIT activeChanged();}} + void setSelected(bool selected) { if (m_selected!= selected) {m_selected = selected; Q_EMIT selectedChanged();}} + void sethasFocus(bool focus) { if (m_focus != focus) {m_focus = focus; Q_EMIT hasFocusChanged();}} + void setOn(bool on) { if (m_on != on) {m_on = on ; Q_EMIT onChanged();}} + void setHover(bool hover) { if (m_hover != hover) {m_hover = hover ; Q_EMIT hoverChanged();}} + void setHorizontal(bool horizontal) { if (m_horizontal != horizontal) {m_horizontal = horizontal; Q_EMIT horizontalChanged();}} + void setTransient(bool transient) { if (m_transient != transient) {m_transient = transient; Q_EMIT transientChanged();}} + void setMinimum(int minimum) { if (m_minimum!= minimum) {m_minimum = minimum; Q_EMIT minimumChanged();}} + void setMaximum(int maximum) { if (m_maximum != maximum) {m_maximum = maximum; Q_EMIT maximumChanged();}} + void setValue(int value) { if (m_value!= value) {m_value = value; Q_EMIT valueChanged();}} + void setStep(int step) { if (m_step != step) { m_step = step; Q_EMIT stepChanged(); }} + void setPaintMargins(int value) { if (m_paintMargins!= value) {m_paintMargins = value; Q_EMIT paintMarginsChanged(); } } void setElementType(const QString &str); - void setText(const QString &str) { if (m_text != str) {m_text = str; emit textChanged();}} - void setActiveControl(const QString &str) { if (m_activeControl != str) {m_activeControl = str; emit activeControlChanged();}} + void setText(const QString &str) { if (m_text != str) {m_text = str; Q_EMIT textChanged();}} + void setActiveControl(const QString &str) { if (m_activeControl != str) {m_activeControl = str; Q_EMIT activeControlChanged();}} void setHints(const QVariantMap &str); - void setProperties(const QVariantMap &props) { if (m_properties != props) { m_properties = props; emit propertiesChanged(); } } + void setProperties(const QVariantMap &props) { if (m_properties != props) { m_properties = props; Q_EMIT propertiesChanged(); } } void resetHints(); int contentWidth() const { return m_contentWidth; }
