Hello community, here is the log from the commit of package plasma-framework for openSUSE:Factory checked in at 2017-04-30 21:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old) and /work/SRC/openSUSE:Factory/.plasma-framework.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework" Sun Apr 30 21:22:11 2017 rev:46 rq:492100 version:5.33.0 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes 2017-03-28 15:13:35.310938875 +0200 +++ /work/SRC/openSUSE:Factory/.plasma-framework.new/plasma-framework.changes 2017-04-30 21:22:13.470856243 +0200 @@ -1,0 +2,40 @@ +Sat Apr 15 10:15:17 CEST 2017 - [email protected] + +- Drop upstreamed patches: + * 0001-Handle-applyPrefixes-with-an-empty-string.patch +- Add patches from upstream: + * keep-implicit-size-if-set.patch - Fixes icon size in desktop toolbox +- Update to 5.33.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-5.33.0.php +- Changes since 5.32.0: + * Upgrade ECM and KF5 version requirements for 5.33.0 release. + * [ModelContextMenu] Silence warnings + * [ModelContextMenu] Use Instantiator instead of Repeater-and-reparent-hack + * [Calendar] Shrink and elide week names like is done with day delegate + * [Icon Item] Make "smooth" property actually do something + * sensible implicit size for svgs + * [Default Tooltip] Fix icon size + * fix stylesheet for fcitx.svgz + * fix typo, iterate all colors available + * Set implicit size from source size for image/SVG URL sources. + * add a new property in containment, for an edit mode + * correct maskRequestedPrefix when no prefix is used + * [Menu] Harmonize openRelative placement + * Add KAcceleratorManager + * Plasma controls based on QtQuickControls2 + * Upgrade KF5 version to 5.33.0. + * Handle applyPrefixes with an empty string + * Forward keyPressEvent to super class + * actually delete old theme caches + * [Containment Interface] Trigger context menus on pressing "Menu" key + * [Breeze Plasma Theme] Improve action-overlay icons + * Port away from setRoleNames where easily possible + * Use initialiser list + * Ref/deref DataEngines even if the metadata is invalid + * Implement FadingMaterial frag/vert shaders on core profile + * Split frag and vert code of FadingNode into separate files + * Small cleanups + +------------------------------------------------------------------- Old: ---- 0001-Handle-applyPrefixes-with-an-empty-string.patch plasma-framework-5.32.0.tar.xz New: ---- keep-implicit-size-if-set.patch plasma-framework-5.33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-framework.spec ++++++ --- /var/tmp/diff_new_pack.EdhWEa/_old 2017-04-30 21:22:14.282741768 +0200 +++ /var/tmp/diff_new_pack.EdhWEa/_new 2017-04-30 21:22:14.286741205 +0200 @@ -17,9 +17,9 @@ %bcond_without lang -%define _tar_path 5.32 +%define _tar_path 5.33 Name: plasma-framework -Version: 5.32.0 +Version: 5.33.0 Release: 0 %define kf5_version %{version} Summary: Plasma library and runtime components based upon KF5 and Qt5 @@ -31,7 +31,7 @@ # PATCH-FIX-OPENSUSE loosen-up-kactivities-requirement.patch -- require kactivities 5.19.0, as we can't update kactivities5 to 5.26.0 before Plasma 5.6.0 Patch0: loosen-up-kactivities-requirement.patch # PATCH-FIX-UPSTREAM -Patch101: 0001-Handle-applyPrefixes-with-an-empty-string.patch +Patch101: keep-implicit-size-if-set.patch BuildRequires: extra-cmake-modules >= %{_tar_path} BuildRequires: fdupes BuildRequires: kactivities5-devel >= 5.19.0 ++++++ keep-implicit-size-if-set.patch ++++++ >From fb8ed07651a7101c2f9c41c6e6676ac8196c1225 Mon Sep 17 00:00:00 2001 From: Marco Martin <[email protected]> Date: Mon, 3 Apr 2017 15:42:29 +0200 Subject: if the user did set an implicit size, keep it Summary: if the user code did something like IconItem { implicitWidth: 32 implicitHeight: 32 } then never automatically update implicitWidth or height. this favors compatibility and fixes the desktop toolbox appearance Test Plan: textbox works, other icon items in plasmashell seems properly sized. applet alternatives fix is still needed Reviewers: #plasma, hein Reviewed By: #plasma, hein Subscribers: hein, davidedmundson, plasma-devel, #frameworks Tags: #plasma, #frameworks Differential Revision: https://phabricator.kde.org/D5243 --- src/declarativeimports/core/iconitem.cpp | 44 +++++++++++++++++++++++++++++--- src/declarativeimports/core/iconitem.h | 11 ++++++++ 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp index e1666aa..2b96c61 100644 --- a/src/declarativeimports/core/iconitem.cpp +++ b/src/declarativeimports/core/iconitem.cpp @@ -49,6 +49,8 @@ IconItem::IconItem(QQuickItem *parent) m_sizeChanged(false), m_allowNextAnimation(false), m_blockNextAnimation(false), + m_implicitHeightSetByUser(false), + m_implicitWidthSetByUser(false), m_colorGroup(Plasma::Theme::NormalColorGroup), m_animValue(0) { @@ -75,6 +77,9 @@ IconItem::IconItem(QQuickItem *parent) connect(this, SIGNAL(overlaysChanged()), this, SLOT(schedulePixmapUpdate())); + connect(this, &IconItem::implicitWidthChanged, this, &IconItem::implicitWidthChanged2); + connect(this, &IconItem::implicitHeightChanged, this, &IconItem::implicitHeightChanged2); + updateImplicitSize(); } @@ -88,7 +93,13 @@ void IconItem::updateImplicitSize() const QSize &s = m_imageIcon.size(); if (s.isValid()) { - setImplicitSize(s.width(), s.height()); + if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) { + setImplicitSize(s.width(), s.height()); + } else if (!m_implicitWidthSetByUser) { + setImplicitWidth(s.width()); + } else if (!m_implicitHeightSetByUser) { + setImplicitHeight(s.height()); + } return; } @@ -105,7 +116,13 @@ void IconItem::updateImplicitSize() s = m_svgIcon->size(); } if (s.isValid()) { - setImplicitSize(s.width(), s.height()); + if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) { + setImplicitSize(s.width(), s.height()); + } else if (!m_implicitWidthSetByUser) { + setImplicitWidth(s.width()); + } else if (!m_implicitHeightSetByUser) { + setImplicitHeight(s.height()); + } return; } @@ -113,7 +130,14 @@ void IconItem::updateImplicitSize() // Fall back to initializing implicit size to the Dialog size. const int implicitSize = KIconLoader::global()->currentSize(KIconLoader::Dialog); - setImplicitSize(implicitSize, implicitSize); + + if (!m_implicitWidthSetByUser && !m_implicitHeightSetByUser) { + setImplicitSize(implicitSize, implicitSize); + } else if (!m_implicitWidthSetByUser) { + setImplicitWidth(implicitSize); + } else if (!m_implicitHeightSetByUser) { + setImplicitHeight(implicitSize); + } } void IconItem::setSource(const QVariant &source) @@ -418,6 +442,20 @@ Plasma::Svg::Status IconItem::status() const return m_status; } +void IconItem::setImplicitHeight2(int height) +{ + m_implicitHeightSetByUser = true; + setImplicitHeight(height); + emit implicitHeightChanged2(); +} + +void IconItem::setImplicitWidth2(int width) +{ + m_implicitWidthSetByUser = true; + setImplicitWidth(width); + emit implicitWidthChanged2(); +} + void IconItem::updatePolish() { QQuickItem::updatePolish(); diff --git a/src/declarativeimports/core/iconitem.h b/src/declarativeimports/core/iconitem.h index e4b2a95..8b524e7 100644 --- a/src/declarativeimports/core/iconitem.h +++ b/src/declarativeimports/core/iconitem.h @@ -119,6 +119,10 @@ class IconItem : public QQuickItem */ Q_PROPERTY(int paintedHeight READ paintedHeight NOTIFY paintedSizeChanged) + Q_PROPERTY(int implicitHeight READ implicitHeight WRITE setImplicitHeight2 NOTIFY implicitHeightChanged2) + + Q_PROPERTY(int implicitWidth READ implicitWidth WRITE setImplicitWidth2 NOTIFY implicitWidthChanged2) + public: IconItem(QQuickItem *parent = 0); ~IconItem(); @@ -155,6 +159,9 @@ public: void setStatus(Plasma::Svg::Status status); Plasma::Svg::Status status() const; + void setImplicitHeight2(int height); + void setImplicitWidth2(int height); + void updatePolish() Q_DECL_OVERRIDE; QSGNode* updatePaintNode(QSGNode * oldNode, UpdatePaintNodeData * updatePaintNodeData) Q_DECL_OVERRIDE; @@ -176,6 +183,8 @@ Q_SIGNALS: void colorGroupChanged(); void paintedSizeChanged(); void statusChanged(); + void implicitHeightChanged2(); + void implicitWidthChanged2(); private Q_SLOTS: void schedulePixmapUpdate(); @@ -210,6 +219,8 @@ private: bool m_sizeChanged; bool m_allowNextAnimation; bool m_blockNextAnimation; + bool m_implicitHeightSetByUser; + bool m_implicitWidthSetByUser; QPixmap m_iconPixmap; QPixmap m_oldIconPixmap; -- cgit v0.11.2 ++++++ plasma-framework-5.32.0.tar.xz -> plasma-framework-5.33.0.tar.xz ++++++ ++++ 8260 lines of diff (skipped)
