Oxide

Merge lp://staging/~osomon/oxide/touch-selection-api-updates into lp://staging/~oxide-developers/oxide/oxide.trunk

touch-selection-api-updates
Merge into oxide.trunk

Proposed by Olivier Tilloy on 2016-03-03

Status:

Merged

Merged at revision:

1388

Proposed branch:

lp://staging/~osomon/oxide/touch-selection-api-updates

Merge into:

lp://staging/~oxide-developers/oxide/oxide.trunk

Diff against target:

667 lines (+142/-59)

20 files modified

qt/core/browser/oxide_qt_contents_view.cc (+8/-2)
qt/core/browser/oxide_qt_contents_view.h (+3/-1)
qt/core/glue/oxide_qt_contents_view_proxy.h (+2/-0)
qt/core/glue/oxide_qt_contents_view_proxy_client.h (+3/-1)
qt/core/glue/oxide_qt_web_view_proxy.h (+0/-1)
qt/qmlplugin/oxide.qmltypes (+8/-2)
qt/qmlplugin/oxide_qml_plugin.cc (+6/-1)
qt/quick/api/oxideqquicktouchselectioncontroller.cc (+26/-4)
qt/quick/api/oxideqquicktouchselectioncontroller.h (+11/-2)
qt/quick/api/oxideqquickwebview.cc (+2/-8)
qt/quick/api/oxideqquickwebview_p.h (+0/-3)
qt/quick/oxide_qquick_contents_view.cc (+18/-3)
qt/quick/oxide_qquick_contents_view.h (+11/-7)
shared/browser/oxide_render_widget_host_view.cc (+16/-3)
shared/browser/oxide_render_widget_host_view.h (+1/-0)
shared/browser/oxide_render_widget_host_view_container.h (+1/-1)
shared/browser/oxide_web_contents_view.cc (+19/-17)
shared/browser/oxide_web_contents_view.h (+3/-1)
shared/browser/oxide_web_contents_view_client.cc (+2/-1)
shared/browser/oxide_web_contents_view_client.h (+2/-1)

To merge this branch:

bzr merge lp://staging/~osomon/oxide/touch-selection-api-updates

Related bugs:

Bug #1556762: WebView.TouchSelectionController needs a 'handleDragInProgress' property	High	Fix Released
Bug #1556764: WebView.TouchSelectionController needs a hide() method	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Chris Coulson		2016-03-03	Approve on 2016-03-21
Review via email: mp+287961@code.staging.launchpad.net

Commit message

Touch selection API updates:
- enable adaptive handle orientation
- add an 'handleDragInProgress' property to OxideQQuickTouchSelectionController
- add a hide() method to OxideQQuickTouchSelectionController

Description of the change

The new 'handleDragInProgress' property will allow clients to hide a quick menu while a handle drag is in progress (required to comply with webbrowser-app’s design specification). Similarly, the hide() method will allow hiding the quick menu after tapping one of its actions, per design specification.

lp://staging/~osomon/oxide/touch-selection-api-updates updated on 2016-03-10

1314. By Olivier Tilloy on 2016-03-03: Register updated TouchSelectionController type.
1315. By Olivier Tilloy on 2016-03-09: Add a hide() method on OxideQQuickTouchSelectionController.
This will be used to hide the handles and quick menu after tapping an action.
1316. By Olivier Tilloy on 2016-03-10: Merge the latest changes from trunk.
1317. By Olivier Tilloy on 2016-03-10: Fix build.
1318. By Olivier Tilloy on 2016-03-10: Update the qmltypes file with API additions.

Revision history for this message

Chris Coulson (chrisccoulson) wrote on 2016-03-21:

This is mostly ok - there's one small architectural issues though (I've left a comment inline)

review: Needs Fixing

lp://staging/~osomon/oxide/touch-selection-api-updates updated on 2016-03-21

1319. By Olivier Tilloy on 2016-03-21: Bump revision to 1.15, as 1.14 has been branched already.
1320. By Olivier Tilloy on 2016-03-21: Move ownership of OxideQQuickTouchSelectionController to oxide::qquick::ContentsView.