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

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~oxide-developers/oxide/oxide.trunk at revision 1309

Chris Coulson: Approve on 2016-01-12

Olivier Tilloy (community): Abstain on 2015-11-13

Diff: 2496 lines (+1435/-54)

37 files modified

qt/core/browser/oxide_qt_browser_platform_integration.cc (+8/-3)
qt/core/browser/oxide_qt_browser_platform_integration.h (+1/-0)
qt/core/browser/oxide_qt_touch_handle_drawable.cc (+105/-0)
qt/core/browser/oxide_qt_touch_handle_drawable.h (+56/-0)
qt/core/browser/oxide_qt_web_context_menu.cc (+1/-0)
qt/core/browser/oxide_qt_web_view.cc (+58/-4)
qt/core/browser/oxide_qt_web_view.h (+13/-7)
qt/core/core.gyp (+4/-1)
qt/core/glue/oxide_qt_touch_handle_drawable_proxy.h (+56/-0)
qt/core/glue/oxide_qt_web_context_menu_proxy_client.h (+0/-11)
qt/core/glue/oxide_qt_web_view_proxy.h (+18/-4)
qt/core/glue/oxide_qt_web_view_proxy_client.h (+8/-1)
qt/qmlplugin/oxide.qmltypes (+28/-0)
qt/qmlplugin/oxide_qml_plugin.cc (+3/-0)
qt/quick/CMakeLists.txt (+3/-1)
qt/quick/api/oxideqquicktouchselectioncontroller.cc (+92/-0)
qt/quick/api/oxideqquicktouchselectioncontroller_p.h (+74/-0)
qt/quick/api/oxideqquickwebview.cc (+45/-1)
qt/quick/api/oxideqquickwebview_p.h (+10/-0)
qt/quick/api/oxideqquickwebview_p_p.h (+7/-1)
qt/quick/oxide_qquick_touch_handle_drawable.cc (+286/-0)
qt/quick/oxide_qquick_touch_handle_drawable.h (+70/-0)
qt/quick/oxide_qquick_web_context_menu.cc (+1/-0)
qt/tests/qmltests/api/tst_WebView_editingCapabilities.html (+6/-0)
qt/tests/qmltests/api/tst_WebView_editingCapabilities.qml (+132/-0)
shared/browser/oxide_browser_platform_integration.cc (+6/-0)
shared/browser/oxide_browser_platform_integration.h (+2/-0)
shared/browser/oxide_browser_platform_integration_observer.h (+3/-1)
shared/browser/oxide_render_widget_host_view.cc (+153/-2)
shared/browser/oxide_render_widget_host_view.h (+27/-1)
shared/browser/oxide_render_widget_host_view_container.h (+12/-1)
shared/browser/oxide_web_view.cc (+100/-4)
shared/browser/oxide_web_view.h (+18/-5)
shared/browser/oxide_web_view_client.cc (+10/-1)
shared/browser/oxide_web_view_client.h (+16/-1)
shared/renderer/oxide_content_renderer_client.cc (+1/-3)
shared/shared.gyp (+2/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1376268: Implement a touch editing UI

High

Fix Released

Link a bug report

Related blueprints

1310. By Olivier Tilloy on 2016-01-12

Merge the latest changes from trunk and resolve a minor conflict.

1309. By Olivier Tilloy on 2016-01-08

Make RWHV an implementation of ui::TouchSelectionControllreClient, instead of proxying calls to a separate object.

1308. By Olivier Tilloy on 2016-01-08

Move the pointer to the touch selection handle to OxideQQuickTouchSelectionControllerPrivate.

1307. By Olivier Tilloy on 2016-01-08

onTouchSelectionChanged doesn’t need to be a slot.

1306. By Olivier Tilloy on 2016-01-08

Remove explicit disconnections in destructor, which are handled automatically by QObject.

1305. By Olivier Tilloy on 2016-01-08

Update copyright years in headers of changed files.

1304. By Olivier Tilloy on 2016-01-08

Fix a regression with vertical positioning of handles that crept in a previous commit.

1303. By Olivier Tilloy on 2016-01-08

Merge the latest changes from trunk.

1302. By Olivier Tilloy on 2016-01-08

Remove the base oxide::TouchHandleDrawable implementation, and oxide::TouchHandleDrawableDelegate.
This was one layer too many for no good reason.

1301. By Olivier Tilloy on 2016-01-07

Factor out code in a helper function.