Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/orientationGoneWrong into lp:ubuntu-ui-toolkit/staging

[Christian Dywan]

Take OrientationHelper y coordinate from real parent height

[Tim Peeters (tpeeters)]

makes sense

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1393
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1430/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1293
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/160
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/160/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1291
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1291/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17961

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/1430/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/OrientationHelper.qml'
--- modules/Ubuntu/Components/OrientationHelper.qml	2015-01-09 14:35:43 +0000
+++ modules/Ubuntu/Components/OrientationHelper.qml	2015-02-11 10:28:28 +0000
@@ -98,7 +98,7 @@
     property bool anchorToKeyboard: false
 
     x: parent ? (parent.width - width) / 2 : 0
-    y: parent ? (d.availableParentHeight - height) / 2 : 0
+    y: parent ? (parent.height - height) / 2 : 0
     width: parent ? (d.flipDimensions ? d.availableParentHeight : parent.width) : 0
     height: parent ? (d.flipDimensions ? parent.width : d.availableParentHeight) : 0
 

=== added file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	1970-01-01 00:00:00 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.header.qml	2015-02-11 10:28:28 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2015 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/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.1
+
+MainView {
+    width: units.gu(48)
+    height: units.gu(60)
+    useDeprecatedToolbar: false
+
+    Page {
+        title: "Header"
+        head.contents: TextField {
+            objectName: "textfield"
+            placeholderText: "Header"
+            width: parent ? parent.width : 0
+        }
+    }
+}

=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-02-02 16:48:37 +0000
+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py	2015-02-11 10:28:28 +0000
@@ -103,17 +103,27 @@
         dir_path, 'test_textinput.textarea.qml')
     customfield_qml_file_path = os.path.join(
         dir_path, 'test_textinput.textfield_custom.qml')
+    header_qml_file_path = os.path.join(
+        dir_path, 'test_textinput.header.qml')
 
     scenarios = [
         ('textfield',
-            dict(test_qml_file_path=textfield_qml_file_path,
-                 objectName='textfield')),
+         dict(test_qml_file_path=textfield_qml_file_path,
+              objectName='textfield')),
         ('textarea',
-            dict(test_qml_file_path=textarea_qml_file_path,
-                 objectName='textarea')),
+         dict(test_qml_file_path=textarea_qml_file_path,
+              objectName='textarea')),
         ('customfield',
-            dict(test_qml_file_path=customfield_qml_file_path,
-                 objectName='textfield')),
+         dict(test_qml_file_path=customfield_qml_file_path,
+              objectName='textfield')),
+        ('header',
+         dict(test_qml_file_path=header_qml_file_path,
+              objectName='textfield')),
+    ]
+    scenarios = [
+        ('header',
+         dict(test_qml_file_path=header_qml_file_path,
+              objectName='textfield')),
     ]
 
     def get_command_line(self, command_line):
@@ -142,9 +152,21 @@
 
         self._assert_not_visible(objectName='text_input_contextmenu')
 
+    def test_popover_not_obscured(self):
+        self.pointing_device.click_object(self.textfield)
+        cursor = self.main_view.select_single(
+            objectName='text_cursor_style_cursorPosition')
+        sleep(1)
+        self.pointing_device.click_object(cursor)
+        popover = self.main_view.get_text_input_context_menu(
+            'text_input_contextmenu')
+        self.assertTrue(popover.globalRect.y > 0,
+                        '%s <= 0' % popover.globalRect.y)
+
     def test_popover_visible_after_tapping_caret(self):
         # Insert Mode
         self.pointing_device.click_object(self.textfield)
+        sleep(1)
         cursor = self.main_view.select_single(
             objectName='text_cursor_style_cursorPosition')
         if (self.textfield.text):
@@ -158,6 +180,7 @@
         # Insert Mode
         self.pointing_device.click_object(self.textfield)
         self.textfield.keyboard.type('Lorem ipsum')
+        sleep(1)
         cursor = self.main_view.select_single(
             objectName='text_cursor_style_cursorPosition')
         x, y = get_center_point(cursor)