Ubuntu UI Toolkit

Merge lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection into lp://staging/ubuntu-ui-toolkit

textinput-text-selection
Merge into trunk

Proposed by Zsombor Egri on 2014-04-03

Status:

Superseded

Proposed branch:

lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection

Merge into:

lp://staging/ubuntu-ui-toolkit

Diff against target:

2647 lines (+1489/-457)

19 files modified

components.api (+2/-2)
modules/Ubuntu/Components/InputHandler.qml (+297/-0)
modules/Ubuntu/Components/TextArea.qml (+42/-130)
modules/Ubuntu/Components/TextCursor.qml (+1/-1)
modules/Ubuntu/Components/TextField.qml (+80/-133)
modules/Ubuntu/Components/Themes/Ambiance/TextAreaStyle.qml (+5/-5)
modules/Ubuntu/Components/plugin/ucmousefilters.cpp (+13/-3)
modules/Ubuntu/Components/qmldir (+1/-0)
modules/Ubuntu/Test/UbuntuTestCase.qml (+69/-1)
modules/Ubuntu/Test/deployment.pri (+6/-1)
tests/resources/inputs/TextInputs.qml (+85/-0)
tests/unit/runtest.sh (+1/-1)
tests/unit_x11/tst_components/tst_textarea.qml (+286/-60)
tests/unit_x11/tst_components/tst_textarea_in_flickable.qml (+58/-37)
tests/unit_x11/tst_components/tst_textfield.qml (+282/-63)
tests/unit_x11/tst_mousefilters/HoverEvent.qml (+38/-0)
tests/unit_x11/tst_mousefilters/tst_mousefilters.pro (+2/-1)
tests/unit_x11/tst_mousefilters/tst_mousefilterstest.cpp (+118/-4)
tests/unit_x11/tst_test/tst_ubuntutestcase.qml (+103/-15)

To merge this branch:

bzr merge lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection

Related bugs:

Bug #1168914: TextArea should allow mouse selections if mouse present	Critical	Fix Released
Bug #1183255: [text inputs] Revisit text selection in TextField and TextArea	Critical	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-04-09
Cris Dywan		2014-04-03	Needs Fixing on 2014-04-09
Review via email: mp+213983@code.staging.launchpad.net

This proposal has been superseded by a proposal from 2014-04-09.

Commit message

TextField and TextArea selection fixes. Also fixes scrolling for both.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1990/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1993/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-07:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/1995/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2000/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection updated on 2014-04-08

999. By Zsombor Egri on 2014-04-08: prereq merge
1000. By Zsombor Egri on 2014-04-08: event buffer flush
1001. By Zsombor Egri on 2014-04-08: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2002/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08:

FAILED: Continuous integration, rev:1001
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2009/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/94/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4615/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/957/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4208/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4739/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2009/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection updated on 2014-04-09

1002. By Zsombor Egri on 2014-04-08: test case fix
1003. By Zsombor Egri on 2014-04-08: prereq merge
1004. By Zsombor Egri on 2014-04-09: test cases cleanup
1005. By Zsombor Egri on 2014-04-09: default checking test cases fixed

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2014/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-04-09:

I see the same test failure here as J locally.
> tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)
> tryCompare(moveSpy, "count", 1, 200);
Why not moveSpy.wait(); here? That seems to fix it for me.

When using select and context menu a few times it's possible to change the selection after the menu opens but before letting go of the mouse button. So I don't get what I selected or worst case nothing.

What I manually checked is that I can select, including scrolling, get a menu, copy, paste and so on, double click to select a word, all of these seem sold aside from the above issue.

FTR toggleFlickablesInteractive looks rather hackish… I guess Repeater doesn't support it, and PropertyChanges doesn't take a list either… but let's have it as-is for now.

Should maybe selectionTimeout.interval be added to modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml:31

test_press_and_hold_over_selected_text etc. doesn't test the context menu. Especially given the above problem I found while using it, I think we need to test that it can be clicked and catches the right text. Possibly AP.

review: Needs Fixing

Revision history for this message

Zsombor Egri (zsombi) wrote on 2014-04-09:

> I see the same test failure here as J locally.
> > tests/unit_x11/tst_components/tst_textarea_in_flickable.qml(72)
> > tryCompare(moveSpy, "count", 1, 200);
> Why not moveSpy.wait(); here? That seems to fix it for me.

Ahh, right :) I'll fix it.

>
> When using select and context menu a few times it's possible to change the
> selection after the menu opens but before letting go of the mouse button. So I
> don't get what I selected or worst case nothing.

Let's do this in a separate branch..

>
> What I manually checked is that I can select, including scrolling, get a menu,
> copy, paste and so on, double click to select a word, all of these seem sold
> aside from the above issue.
>
> FTR toggleFlickablesInteractive looks rather hackish… I guess Repeater doesn't
> support it, and PropertyChanges doesn't take a list either… but let's have it
> as-is for now.

Well, limitation of PropertyChange, maybe we propose some Change component upstream to deal with a list of targets :).

>
> Should maybe selectionTimeout.interval be added to
> modules/Ubuntu/Components/Themes/Ambiance/TextCursorStyle.qml:31

I will put this in the TextFieldStyle/TextAreaStyle components rather than the cursor style.

>
> test_press_and_hold_over_selected_text etc. doesn't test the context menu.
> Especially given the above problem I found while using it, I think we need to
> test that it can be clicked and catches the right text. Possibly AP.

Yep, but let's get this in a separate branch as well.

Revision history for this message

Cris Dywan (kalikiana) wrote on 2014-04-09:

Filed bug 1304952 for testing the context menu.

lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection updated on 2014-04-09

1006. By Zsombor Egri on 2014-04-09: use spy's wait() function wherever is possible
1007. By Zsombor Egri on 2014-04-09: selection mode timeout configurable from theme
1008. By Zsombor Egri on 2014-04-09: text selection does not continue while context menu is open
1009. By Zsombor Egri on 2014-04-09: rogue typo removed
1010. By Zsombor Egri on 2014-04-09: prereq merge

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09:

FAILED: Continuous integration, rev:1008
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/2016/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-trusty-touch/129
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/4675
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-amd64-ci/964
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/964
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-trusty-armhf-ci/964/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/125
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4259
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/4259/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/5820
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/4030
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4802
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/4802/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-ui-toolkit-ci/2016/rebuild

review: Needs Fixing (continuous-integration)

lp://staging/~zsombi/ubuntu-ui-toolkit/textinput-text-selection updated on 2014-04-25

1011. By Zsombor Egri on 2014-04-09: unify the event buffer emptying timeout in TextArea test case with TextField
1012. By Zsombor Egri on 2014-04-09: prereq merge
1013. By Zsombor Egri on 2014-04-10: staging merged
1014. By Zsombor Egri on 2014-04-10: autopilot related fixes
1015. By Zsombor Egri on 2014-04-10: input handler should be inactive while context menu is open
1016. By Zsombor Egri on 2014-04-14: intermediate steps
1017. By Zsombor Egri on 2014-04-14: prerequisite merge
1018. By Zsombor Egri on 2014-04-15: TextArea test fixes
1019. By Zsombor Egri on 2014-04-15: prerequisite merge
1020. By Zsombor Egri on 2014-04-15: prereq merge
1021. By Zsombor Egri on 2014-04-15: cleanup
1022. By Zsombor Egri on 2014-04-15: more cleanup
1023. By Zsombor Egri on 2014-04-16: staging merge
1024. By Zsombor Egri on 2014-04-17: staging merge
1025. By Zsombor Egri on 2014-04-20: replace flick() with mouseDrag()
1026. By Zsombor Egri on 2014-04-20: change flick() with mouseDrag()
1027. By Zsombor Egri on 2014-04-23: versioning merge
1028. By Zsombor Egri on 2014-04-24: tests reworked for tst_textarea_in_flickable.qml
1029. By Zsombor Egri on 2014-04-24: staging merge
1030. By Zsombor Egri on 2014-04-25: staging merge