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

Proposed by Cris Dywan
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1506
Merged at revision: 1509
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noHandlerWhenEmpty
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 47 lines (+10/-0)
3 files modified
modules/Ubuntu/Components/1.2/TextCursor.qml (+1/-0)
modules/Ubuntu/Components/1.3/TextCursor.qml (+1/-0)
tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py (+8/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/noHandlerWhenEmpty
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+259320@code.launchpad.net

Commit message

Only show handlers if text isn't empty

To post a comment you must log in.
Revision history for this message
Zsombor Egri (zsombi) wrote :

Hehe, pretty straight forward, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/1.2/TextCursor.qml'
2--- modules/Ubuntu/Components/1.2/TextCursor.qml 2015-04-30 08:32:44 +0000
3+++ modules/Ubuntu/Components/1.2/TextCursor.qml 2015-05-18 05:39:57 +0000
4@@ -145,6 +145,7 @@
5 property: "visible"
6 value: QuickUtils.touchScreenAvailable
7 && (contextMenuVisible || !typing)
8+ && handler.main.text !== ""
9 }
10 property bool typing: false
11 property bool contextMenuVisible: false
12
13=== modified file 'modules/Ubuntu/Components/1.3/TextCursor.qml'
14--- modules/Ubuntu/Components/1.3/TextCursor.qml 2015-04-29 08:55:31 +0000
15+++ modules/Ubuntu/Components/1.3/TextCursor.qml 2015-05-18 05:39:57 +0000
16@@ -146,6 +146,7 @@
17 property: "visible"
18 value: QuickUtils.touchScreenAvailable
19 && (contextMenuVisible || !typing)
20+ && handler.main.text !== ""
21 }
22 property bool typing: false
23 property bool contextMenuVisible: false
24
25=== modified file 'tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py'
26--- tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py 2015-04-14 21:02:06 +0000
27+++ tests/autopilot/ubuntuuitoolkit/tests/components/test_textinput.py 2015-05-18 05:39:57 +0000
28@@ -70,11 +70,19 @@
29 return self.main_view.select_single(
30 objectName=positionProperty + '_draggeditem')
31
32+ def test_caret_hidden_if_empty(self):
33+ cursorName = 'text_cursor_style_caret_cursorPosition'
34+ self._assert_not_visible(objectName=cursorName)
35+ self.pointing_device.click_object(self.textfield)
36+ self.assertTrue(self.textfield.focus)
37+ self._assert_not_visible(objectName=cursorName)
38+
39 def test_caret_visible_on_focus(self):
40 cursorName = 'text_cursor_style_caret_cursorPosition'
41 self._assert_not_visible(objectName=cursorName)
42 self.pointing_device.click_object(self.textfield)
43 self.assertTrue(self.textfield.focus)
44+ self.textfield.keyboard.type('Lorem ipsum')
45 self.main_view.select_single(objectName=cursorName)
46
47 def test_caret_hide_while_typing(self):

Subscribers

People subscribed via source and target branches