Merge lp:~michael-sheldon/ubuntu-keyboard/fix-1332624 into lp:ubuntu-keyboard

[Michael Sheldon]

Handle any discrepancy between keyboard's fullScreenItem size and the real screen size (e.g. caused by the shell's top bar)

Handles any discrepancy between keyboard's fullScreenItem size and the real screen size (e.g. caused by the shell's top bar), as described in https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1332624

[Michael Sheldon (michael-sheldon)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/ubuntu-keyboard) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:179
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/404/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/29/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/404/rebuild

review: Needs Fixing (continuous-integration)

[lp:~michael-sheldon/ubuntu-keyboard/fix-1332624]

180. By Michael Sheldon on 2014-06-25

Add QGSettings header to fake QGSettings test rather than hard-coding path

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-ci/405/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-keyboard-utopic-i386-ci/30

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-keyboard-ci/405/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Ok, it's just a workaround but well documented - also, it works pretty well :) So a big +1 on this and the build failure fix.

review: Approve

=== modified file 'qml/Keyboard.qml'
--- qml/Keyboard.qml	2014-04-09 17:11:33 +0000
+++ qml/Keyboard.qml	2014-06-25 18:01:22 +0000
@@ -279,8 +279,21 @@
             vheight = keyboardSurface.height;
         }
 
+        // Handle any discrepancy between our fullScreenItem's size and the real
+        // screen size (e.g. caused by the shell's top bar).
+        // Work around for: https://bugs.launchpad.net/ubuntu/+source/ubuntu-keyboard/+bug/1332624
+        var mappingDifference = 0;
+        if (fullScreenItem.height > 0) {
+            if (orientationHelper.orientationAngle == 270 ||
+                orientationHelper.orientationAngle == 90) {
+                mappingDifference = maliit_screen_width - fullScreenItem.width;
+            } else {
+                mappingDifference = maliit_screen_height - fullScreenItem.height;
+            }
+        }
+
         var obj = mapFromItem(keyboardSurface, vx, vy, vwidth, vheight);
-        maliit_geometry.visibleRect = Qt.rect(obj.x, obj.y, obj.width, obj.height);
+        maliit_geometry.visibleRect = Qt.rect(obj.x, obj.y - mappingDifference, obj.width, obj.height);
     }
 
 } // fullScreenItem

=== modified file 'src/plugin/inputmethod_p.h'
--- src/plugin/inputmethod_p.h	2014-06-13 12:24:40 +0000
+++ src/plugin/inputmethod_p.h	2014-06-25 18:01:22 +0000
@@ -172,6 +172,8 @@
         qml_context->setContextProperty("maliit_event_handler", &event_handler);
         qml_context->setContextProperty("maliit_wordribbon", wordRibbon);
         qml_context->setContextProperty("maliit_word_engine", editor.wordEngine());
+        qml_context->setContextProperty("maliit_screen_height", QGuiApplication::primaryScreen()->geometry().height());
+        qml_context->setContextProperty("maliit_screen_width", QGuiApplication::primaryScreen()->geometry().width());
     }
 
 

=== added file 'tests/unittests/ut_keyboardsettings/qgsettings.h'
--- tests/unittests/ut_keyboardsettings/qgsettings.h	1970-01-01 00:00:00 +0000
+++ tests/unittests/ut_keyboardsettings/qgsettings.h	2014-06-25 18:01:22 +0000
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Lars Uebernickel <[e-mail]>
+ */
+
+#ifndef __QGSETTINGS_H__
+#define __QGSETTINGS_H__
+
+#include <QObject>
+#include <QStringList>
+
+/**
+ * @brief QGSettings provides access to application settings stored with GSettings.
+ *
+ * GSettings does not allow keys to contain anything other than lower-case
+ * characters and dashes. This class converts all keys to camelCase, to make it easier
+ * for people used to Qt's naming convention.
+ */
+class QGSettings: public QObject
+{
+    Q_OBJECT
+
+public:
+    /**
+     * @brief Create a QGSettings object for a given schema_id and path.
+     * @param schema_id The id of the schema
+     * @param path If non-empty, specifies the path for a relocatable schema
+     */
+    QGSettings(const QByteArray &schema_id, const QByteArray &path = QByteArray(), QObject *parent = NULL);
+
+    ~QGSettings();
+
+    /**
+     * @brief Gets the value that is stored at key
+     * @param key The key for which to retrieve the value (in camelCase)
+     *
+     * It is an error if key does not exist in the schema associated with this
+     * QGSettings object.
+     */
+    QVariant get(const QString &key) const;
+
+    /**
+     * @brief Sets the value at key to value
+     * @key The key for which to set the value (in camelCase)
+     * @value The value to set
+     *
+     * It is an error if key does not exist in the schema associated with this
+     * QGSettings object.
+     *
+     * Not all values that a QVariant can hold can be serialized into a
+     * setting. Basic types (integers, doubles, strings) and string lists are
+     * supported.
+     */
+    void set(const QString &key, const QVariant &value);
+
+    /**
+     * @brief Sets the value at key to value
+     * @key The key for which to set the value
+     * @value The value to set
+     *
+     * Behaves just like ::set(key, value), but returns false instead of
+     * printing a warning if the key couldn't be set.
+     *
+     * @return whether the key was set
+     */
+    bool trySet(const QString &key, const QVariant &value);
+
+    /**
+     * \brief Retrieves the list of avaliable keys
+     */
+    QStringList keys() const;
+
+    /**
+     * \brief Returns the list of values that key can assume
+     *
+     * Returns an empty list if the schema doesn't contain that information for
+     * the key.
+     */
+    QVariantList choices(const QString &key) const;
+
+    /**
+     * @brief Resets the setting for @key to its default value.
+     */
+    void reset(const QString &key);
+
+    /**
+     * @brief Checks if a schema with the given id is installed.
+     */
+    static bool isSchemaInstalled(const QByteArray &schema_id);
+
+Q_SIGNALS:
+    /**
+     * \brief Emitted when the value associated with key has changed
+     */
+    void changed(const QString &key);
+
+private:
+    struct QGSettingsPrivate *priv;
+    friend struct QGSettingsPrivate;
+};
+
+#endif

=== modified file 'tests/unittests/ut_keyboardsettings/ut_keyboardsettings.pro'
--- tests/unittests/ut_keyboardsettings/ut_keyboardsettings.pro	2013-11-06 09:31:37 +0000
+++ tests/unittests/ut_keyboardsettings/ut_keyboardsettings.pro	2014-06-25 18:01:22 +0000
@@ -8,11 +8,9 @@
 TARGET = ut_keyboardsettings
 QT = core testlib
 
-QGSETTINGS_INCDIR = /usr/include/qt5/QGSettings
-
 HEADERS += \
     $${TOP_SRCDIR}/src/plugin/keyboardsettings.h \
-    $${QGSETTINGS_INCDIR}/qgsettings.h \
+    qgsettings.h
 
 SOURCES += \
     ut_keyboardsettings.cpp \