Ubuntu UI Toolkit

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

  1. persistentSelection
  2. Merge into staging
Proposed by Christian Dywan on 2016-06-21
Status: Merged
Approved by: Christian Dywan on 2016-06-24
Approved revision: 2016
Merged at revision: 2021
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/persistentSelection
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 35 lines (+4/-2)
2 files modified
src/Ubuntu/Components/1.3/TextArea.qml (+3/-2)
src/Ubuntu/Components/1.3/TextField.qml (+1/-0)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/persistentSelection
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration 2016-06-21 Approve on 2016-06-24
Tim Peeters 2016-06-21 Approve on 2016-06-23
Review via email: mp+298014@code.launchpad.net

Commit Message

Set default for TextArea.persistentSelection and correct type

To post a comment you must log in.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2016
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/476/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/939/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/969
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/750
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/724
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3971/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3963
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3968
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3969
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/3970

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/476/rebuild

review: Needs Fixing (continuous-integration)
Tim Peeters (tpeeters) wrote :

Looks good to me.

Just CI is not co-operating.

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
2--- src/Ubuntu/Components/1.3/TextArea.qml 2016-06-06 13:36:35 +0000
3+++ src/Ubuntu/Components/1.3/TextArea.qml 2016-06-21 11:21:16 +0000
4@@ -400,9 +400,9 @@
5
6 /*!
7 Whether the TextArea should keep the selection visible when it loses active
8- focus to another item in the scene. By default this is set to true;
9+ focus to another item in the scene. By default this is set to true.
10
11- \qmlproperty enumeration persistentSelection
12+ \qmlproperty bool persistentSelection
13 */
14 property alias persistentSelection: editor.persistentSelection
15
16@@ -849,6 +849,7 @@
17 height: Math.max(control.contentHeight, editor.contentHeight)
18 wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
19 mouseSelectionMode: TextEdit.SelectWords
20+ persistentSelection: true
21 selectByMouse: true
22 cursorDelegate: TextCursor {
23 handler: inputHandler
24
25=== modified file 'src/Ubuntu/Components/1.3/TextField.qml'
26--- src/Ubuntu/Components/1.3/TextField.qml 2016-05-25 12:48:10 +0000
27+++ src/Ubuntu/Components/1.3/TextField.qml 2016-06-21 11:21:16 +0000
28@@ -1030,6 +1030,7 @@
29
30 // overrides
31 selectByMouse: true
32+ persistentSelection: false
33
34 // input selection and navigation handling
35 Ubuntu.Mouse.forwardTo: [inputHandler]

Subscribers

People subscribed via source and target branches