[SCM] plasma-desktop packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-15-g36a4075

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-desktop.git;a=commitdiff;h=36a4075

The following commit has been merged in the kubuntu_wily_backports branch:
commit 36a4075e479a360960a26520ad4c11f6f26d999b
Author: Philip Muškovac <yofel at gmx.net>
Date:   Thu Jan 14 23:58:50 2016 +0100

    Add patch for git to fix panel resizing
---
 debian/changelog                                 |  1 +
 debian/patches/series                            |  1 +
 debian/patches/upstream_fix_panel_shrinking.diff | 49 ++++++++++++++++++++++++
 3 files changed, 51 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c3fd159..f3b77f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ plasma-desktop (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
   * Build-depend on pkg-kde-tools >= 0.15.18 for l10n-packages.mk support
   * Rename the pam-kwallet recommends to libpam-kwallet as the packages were
     renamed
+  * Cherry pick upstream_fix_panel_shrinking.diff from git
 
  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 17:59:40 +0000
 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c70c93a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_fix_panel_shrinking.diff
diff --git a/debian/patches/upstream_fix_panel_shrinking.diff b/debian/patches/upstream_fix_panel_shrinking.diff
new file mode 100644
index 0000000..7cc1d8b
--- /dev/null
+++ b/debian/patches/upstream_fix_panel_shrinking.diff
@@ -0,0 +1,49 @@
+From 2f07fdd5d34673f856b8f8401ab8447000254aaa Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep at gmail.com>
+Date: Thu, 14 Jan 2016 18:54:57 +0100
+Subject: [PATCH] Fix shrinking panel on top/left/right edge
+
+Use the new computed value for configDialog position.
+Fix regression from 8ba3633227
+
+REVIEW: 126743
+BUG: 357835
+FIXED-IN: 5.5.4
+---
+ .../contents/configuration/panelconfiguration/SizeHandle.qml        | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml b/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
+index 5e6185c..753b6f4 100644
+--- a/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
++++ b/desktoppackage/contents/configuration/panelconfiguration/SizeHandle.qml
+@@ -45,7 +45,7 @@ PlasmaComponents.Button {
+             switch (panel.location) {
+             case PlasmaCore.Types.TopEdge:
+                 var y = Math.min(panel.screen.geometry.y + panel.screen.geometry.height/2, mouse.screenY - mapToItem(dialogRoot, 0, startMouseY).y);
+-                var thickness = Math.max(units.gridUnit, configDialog.y - panel.y);
++                var thickness = Math.max(units.gridUnit, y - panel.y);
+ 
+                 if (thickness % 2 != 0) {
+                     if (mouse.y > startMouseY) {
+@@ -62,7 +62,7 @@ PlasmaComponents.Button {
+                 break;
+             case PlasmaCore.Types.LeftEdge:
+                 var x = Math.min(panel.screen.geometry.x + panel.screen.geometry.width/2, mouse.screenX - mapToItem(dialogRoot, startMouseX, 0).x);
+-                var thickness = Math.max(units.gridUnit, configDialog.x - panel.x);
++                var thickness = Math.max(units.gridUnit, x - panel.x);
+ 
+                 if (thickness % 2 != 0) {
+                     if (mouse.x > startMouseX) {
+@@ -79,7 +79,7 @@ PlasmaComponents.Button {
+                 break;
+             case PlasmaCore.Types.RightEdge:
+                 var x = Math.max(panel.screen.geometry.x + panel.screen.geometry.width/2, mouse.screenX - mapToItem(dialogRoot, startMouseX, 0).x);
+-                var thickness = Math.max(units.gridUnit, panel.screen.geometry.x + panel.screen.geometry.width - (configDialog.x + configDialog.width));
++                var thickness = Math.max(units.gridUnit, panel.screen.geometry.x + panel.screen.geometry.width - (x + configDialog.width));
+ 
+                 if (thickness % 2 != 0) {
+                     if (mouse.x > startMouseX) {
+-- 
+2.7.0.rc3
+

-- 
plasma-desktop packaging