Merge lp:~sergiusens/ubuntu/trusty/maliit-framework/1251330 into lp:ubuntu/trusty/maliit-framework

[Sergio Schvezov]

[lp:~sergiusens/ubuntu/trusty/maliit-framework/1251330]

14. By Sergio Schvezov on 2014-01-30

Adding comment wrt to patch origin

[Daniel d'Andrada (dandrader)]

That git commit from upstream is actually buggy. :/

Will propose a correct version myself.

review: Disapprove

Unmerged revisions

14. By Sergio Schvezov on 2014-01-30

Adding comment wrt to patch origin

13. By Sergio Schvezov on 2014-01-30

Inputcontext to properly notify orientation with native portrait
displays (LP: #1251330)

=== modified file 'debian/changelog'
--- debian/changelog	2014-01-24 13:49:59 +0000
+++ debian/changelog	2014-01-30 17:25:17 +0000
@@ -1,3 +1,10 @@
+maliit-framework (0.99.0+git20130615+97e8335-0ubuntu6) UNRELEASED; urgency=medium
+
+  * Inputcontext to properly notify orientation with native portrait 
+    displays (LP: #1251330) 
+
+ -- Sergio Schvezov <[e-mail]>  Thu, 30 Jan 2014 17:14:04 +0000
+
 maliit-framework (0.99.0+git20130615+97e8335-0ubuntu5) trusty; urgency=medium
 
   * Modify xvfb command to successfully pass tests (LP: #1272249)
 
=== added file 'debian/patches/0006-Inputcontext-to-properly-notify-orientation-with-nat.patch'
--- debian/patches/0006-Inputcontext-to-properly-notify-orientation-with-nat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/0006-Inputcontext-to-properly-notify-orientation-with-nat.patch	2014-01-30 17:25:17 +0000
@@ -0,0 +1,53 @@
+From ea4ed5ec38704264e787631b89b1aba62c72049a Mon Sep 17 00:00:00 2001
+From: Pekka Vuorela <[e-mail]>
+Date: Thu, 4 Jul 2013 17:00:53 +0300
+Subject: [PATCH] Inputcontext to properly notify orientation with native
+ portrait displays
+
+This patch comes from upstream
+
+RevBy: Jan Arne Petersen
+---
+ input-context/minputcontext.cpp | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/input-context/minputcontext.cpp b/input-context/minputcontext.cpp
+index 78b6e81..8f4c6b1 100644
+--- a/input-context/minputcontext.cpp
++++ b/input-context/minputcontext.cpp
+@@ -19,6 +19,7 @@
+ #include "minputcontext.h"
+ 
+ #include <QGuiApplication>
++#include <QScreen>
+ #include <QKeyEvent>
+ #include <QTextFormat>
+ #include <QDebug>
+@@ -36,16 +37,20 @@ namespace
+ 
+     int orientationAngle(Qt::ScreenOrientation orientation)
+     {
++        // Maliit uses orientations relative to screen, Qt relative to world
++        // Note: doesn't work with inverted portrait or landscape as native screen orientation.
++        static bool portraitRotated = qGuiApp->primaryScreen()->primaryOrientation() == Qt::PortraitOrientation;
++
+         switch (orientation) {
+         case Qt::PrimaryOrientation: // Urgh.
+         case Qt::PortraitOrientation:
+-            return MInputContext::Angle270;
++            return portraitRotated ? MInputContext::Angle0 : MInputContext::Angle270;
+         case Qt::LandscapeOrientation:
+-            return MInputContext::Angle0;
++            return portraitRotated ? MInputContext::Angle90 : MInputContext::Angle0;
+         case Qt::InvertedPortraitOrientation:
+-            return MInputContext::Angle90;
++            return portraitRotated ? MInputContext::Angle180 : MInputContext::Angle90;
+         case Qt::InvertedLandscapeOrientation:
+-            return MInputContext::Angle180;
++            return portraitRotated ? MInputContext::Angle270 : MInputContext::Angle180;
+         }
+         return MInputContext::Angle0;
+     }
+-- 
+1.8.5.3
+
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-23 19:47:04 +0000
+++ debian/patches/series	2014-01-30 17:25:17 +0000
@@ -3,3 +3,4 @@
 0003-prediction.patch
 0004-fix_activationlostevent.patch
 0005-testability.patch
+0006-Inputcontext-to-properly-notify-orientation-with-nat.patch