[SCM] qtquickcontrols packaging branch, kubuntu_vivid_mobile, updated. debian/5.5.1-2-2-g8480b44

[Bhushan Shah]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtquickcontrols.git;a=commitdiff;h=8480b44

The following commit has been merged in the kubuntu_vivid_mobile branch:
commit 8480b44fe3f7bd314a9d9ff8f1ef777215a25f77
Author: Bhushan Shah <bshah at kde.org>
Date:   Tue Dec 1 15:02:25 2015 +0530

    Patch for mobile
---
 debian/changelog                                   |  6 +++
 .../kubuntu_fix-display-of-text-handlers.patch     | 61 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 68 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 740ea53..9d19565 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+qtquickcontrols-opensource-src (5.5.1-2+mci2) UNRELEASED; urgency=medium
+
+  * Patch for mobile
+
+ -- Bhushan Shah <bshah at kde.org>  Tue, 01 Dec 2015 15:00:12 +0530
+
 qtquickcontrols-opensource-src (5.5.1-2+mci1) UNRELEASED; urgency=medium
 
   * Patches for mobile
diff --git a/debian/patches/kubuntu_fix-display-of-text-handlers.patch b/debian/patches/kubuntu_fix-display-of-text-handlers.patch
new file mode 100644
index 0000000..c1890a5
--- /dev/null
+++ b/debian/patches/kubuntu_fix-display-of-text-handlers.patch
@@ -0,0 +1,61 @@
+From 3660cd60e9a8f74203b2eefef23f4baa383f75c3 Mon Sep 17 00:00:00 2001
+From: Aleix Pol <aleixpol at kde.org>
+Date: Mon, 2 Nov 2015 16:01:56 +0100
+Subject: [PATCH] Fix display of text handlers
+
+The mappedPos property used has a different coordinates system. We need
+to adapt to it before comparing values.
+Otherwise it depends on the editor position whether the handles will be
+shown.
+
+Change-Id: I497ce497b02931e05194bea0de9ece10b29a316d
+Reviewed-by: Frederik Gladhorn <frederik.gladhorn at theqtcompany.com>
+Reviewed-by: Marco Martin <mart at kde.org>
+Reviewed-by: J-P Nurmi <jpnurmi at theqtcompany.com>
+---
+ src/controls/Private/TextInputWithHandles.qml | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/src/controls/Private/TextInputWithHandles.qml b/src/controls/Private/TextInputWithHandles.qml
+index 42e7fde..b1ea9a5 100644
+--- a/src/controls/Private/TextInputWithHandles.qml
++++ b/src/controls/Private/TextInputWithHandles.qml
+@@ -144,13 +144,15 @@ TextInput {
+         active: control.selectByMouse && Settings.isMobile
+         maximum: cursorHandle.position - 1
+ 
++        readonly property var mappedOrigin: editor.mapToItem(parent, 0,0)
++
+         // Mention scenePos in the mappedPos binding to force re-evaluation if it changes
+-        property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
++        readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
+                                     editor.mapToItem(parent, editor.selectionRectangle.x, editor.selectionRectangle.y) : -1
+         x: mappedPos.x
+         y: mappedPos.y
+ 
+-        visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX <= control.width + 1)
++        visible: pressed || (input.hasSelection && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1)
+ 
+         onPositionChanged: {
+             if (!input.blockRecursion) {
+@@ -173,13 +175,15 @@ TextInput {
+         active: control.selectByMouse && Settings.isMobile
+         minimum: input.hasSelection ? selectionHandle.position + 1 : -1
+ 
++        readonly property var mappedOrigin: editor.mapToItem(parent, 0,0)
++
+         // Mention scenePos in the mappedPos binding to force re-evaluation if it changes
+-        property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
++        readonly property var mappedPos: listener.scenePos.x !== listener.scenePos.y !== Number.MAX_VALUE ?
+                                     editor.mapToItem(parent, editor.cursorRectangle.x, editor.cursorRectangle.y) : -1
+         x: mappedPos.x
+         y: mappedPos.y
+ 
+-        visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX <= control.width + 1)
++        visible: pressed || ((input.cursorVisible || input.hasSelection) && handleX + handleWidth >= -1 && handleX - mappedOrigin.x <= control.width + 1)
+ 
+         onPositionChanged: {
+             if (!input.blockRecursion) {
+-- 
+2.6.2
+
diff --git a/debian/patches/series b/debian/patches/series
index 731b779..69122e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 kubuntu-allow-any-platform-to-have-ismobile-true.patch
 kubuntu-allow-for-styles-to-provide-own-editmenu.patch
+kubuntu_fix-display-of-text-handlers.patch

-- 
qtquickcontrols packaging