[SCM] plasma-framework packaging branch, master, updated. debian/5.28.0-1-12-g9259880

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/plasma-framework.git;a=commitdiff;h=1ec09ec

The following commit has been merged in the master branch:
commit 1ec09ec8b957a4c035ca199ea612695cce50400d
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sat Apr 8 16:07:03 2017 +0200

    Pick "set default hints when repr doesn't export Layout.*" (b99a87a)
    
    Add upstream patch as:
     set-default-hints-when-repr-doesn-t-export-Layout.patch
    This fixes KDE#377153
    
    Gbp-Dch: Full
---
 debian/patches/series                              |  1 +
 ...ult-hints-when-repr-doesn-t-export-Layout.patch | 38 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
index 9ab4c8d..363bd31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Fix-374127-misplacement-of-popups-from-dock-wins.patch
 portait-prop-is-not-relevant-when-there-is-no-text.patch
 correctly-forward-status-from-applets-to-containment.patch
 it-must-also-be-possible-for-the-status-to-be-decreased-a.patch
+set-default-hints-when-repr-doesn-t-export-Layout.patch
diff --git a/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch b/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch
new file mode 100644
index 0000000..095ea27
--- /dev/null
+++ b/debian/patches/set-default-hints-when-repr-doesn-t-export-Layout.patch
@@ -0,0 +1,38 @@
+From: Marco Martin <notmart at gmail.com>
+Date: Fri, 3 Mar 2017 17:52:41 +0100
+Subject: set default hints when repr doesn't export Layout.*
+
+when we go from full to compact repr, if the compact
+doesn't export a Layout attached property, the hints shouldn't
+remain those of the full repr, so reset to default values
+
+BUG:377153
+Reviewed-by:Eike Hein
+---
+ src/plasmaquick/appletquickitem.cpp | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/src/plasmaquick/appletquickitem.cpp b/src/plasmaquick/appletquickitem.cpp
+index e2fd40ece..30a6f321d 100644
+--- a/src/plasmaquick/appletquickitem.cpp
++++ b/src/plasmaquick/appletquickitem.cpp
+@@ -92,7 +92,19 @@ void AppletQuickItemPrivate::connectLayoutAttached(QObject *item)
+         }
+     }
+ 
++    //if the compact repr doesn't export a Layout.* attached property,
++    //reset our own with default values
+     if (!layout) {
++        if (ownLayout) {
++            ownLayout->setProperty("minimumWidth", 0);
++            ownLayout->setProperty("minimumHeight", 0);
++            ownLayout->setProperty("preferredWidth", -1);
++            ownLayout->setProperty("preferredHeight", -1);
++            ownLayout->setProperty("maximumWidth", std::numeric_limits<qreal>::infinity());
++            ownLayout->setProperty("maximumHeight", std::numeric_limits<qreal>::infinity());
++            ownLayout->setProperty("fillWidth", false);
++            ownLayout->setProperty("fillHeight", false);
++        }
+         return;
+     }
+ 

-- 
plasma-framework packaging