Ubuntu UI Toolkit

Merge lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle into lp:ubuntu-ui-toolkit/staging

text_input_larger_selection_handle
Merge into staging

Proposed by Florian Boucault on 2014-10-31

Status:

Superseded

Proposed branch:

lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle

Merge into:

lp:ubuntu-ui-toolkit/staging

Diff against target:

25 lines (+4/-4)

1 file modified

modules/Ubuntu/Components/TextCursor.qml (+4/-4)

To merge this branch:

bzr merge lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration		Needs Fixing on 2014-10-31
Ubuntu SDK team		2014-10-31	Pending
Review via email: mp+240311@code.launchpad.net

This proposal has been superseded by a proposal from 2014-11-05.

Commit message

TextField/TextArea: make selection handle's touch area a 4 grid units wide square.

lp:~fboucault/ubuntu-ui-toolkit/text_input_larger_selection_handle updated on 2014-10-31

1312. By Florian Boucault on 2014-10-31: Reverted unrelated change.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-31:

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-10-31:

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

review: Needs Fixing (continuous-integration)

Unmerged revisions

1312. By Florian Boucault on 2014-10-31: Reverted unrelated change.
1311. By Florian Boucault on 2014-10-31: TextField/TextArea: make selection handle's touch area a 4 grid units wide square.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Dan Chapman 

Florian Boucault

Tom Mirmar

Ubuntu SDK team

1	=== modified file 'modules/Ubuntu/Components/TextCursor.qml'
2	--- modules/Ubuntu/Components/TextCursor.qml 2014-10-07 15:21:11 +0000
3	+++ modules/Ubuntu/Components/TextCursor.qml 2014-10-31 18:41:59 +0000
4	@@ -141,8 +141,8 @@
5	Item {
6	id: draggedItem
7	objectName: cursorItem.positionProperty + "_draggeditem"
8	- width: caret ? Math.max(caret.width, units.gu(2)) : 0
9	- height: caret ? Math.max(caret.height, units.gu(2)) : 0
10	+ width: caret ? Math.max(caret.width, units.gu(4)) : 0
11	+ height: caret ? Math.max(caret.height, units.gu(4)) : 0
12	parent: handler.main
13	visible: cursorItem.visible && (cursorItem.opacity > 0.0) && QuickUtils.touchScreenAvailable
14
15	@@ -198,8 +198,8 @@
16	cy += draggedItem.y;
17	}
18
19	- draggedItem.x = cx;
20	- draggedItem.y = cy;
21	+ draggedItem.x = cx - draggedItem.width / 2 + caret.width / 2;
22	+ draggedItem.y = cy - draggedItem.height / 2 + caret.height / 2;
23	dragger.resetDrag();
24	}
25	// positions caret to the dragged position