Mir

Merge lp://staging/~albaguirre/mir/dialogs_and_tooltips into lp://staging/mir

dialogs_and_tooltips
Merge into development-branch

Proposed by Alberto Aguirre on 2015-01-15

Status:

Merged

Approved by:

Alan Griffiths on 2015-01-22

Approved revision:

no longer in the source branch.

Merged at revision:

2249

Proposed branch:

lp://staging/~albaguirre/mir/dialogs_and_tooltips

Merge into:

lp://staging/mir

Diff against target:

520 lines (+290/-41)

13 files modified

client-ABI-sha1sums (+1/-1)
include/client/mir_toolkit/mir_surface.h (+87/-4)
include/server/mir/scene/surface_creation_parameters.h (+2/-2)
server-ABI-sha1sums (+1/-1)
src/client/mir_surface.cpp (+5/-6)
src/client/mir_surface.h (+1/-1)
src/client/mir_surface_api.cpp (+50/-8)
src/client/symbols.map (+3/-1)
src/protobuf/mir_protobuf.proto (+1/-1)
src/server/frontend/session_mediator.cpp (+4/-4)
src/server/scene/surface_creation_parameters.cpp (+2/-2)
tests/acceptance-tests/test_client_surfaces.cpp (+52/-1)
tests/integration-tests/client/test_mirsurface.cpp (+81/-9)

To merge this branch:

bzr merge lp://staging/~albaguirre/mir/dialogs_and_tooltips

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Alan Griffiths			Approve on 2015-01-22
PS Jenkins bot (community)	continuous-integration		Approve on 2015-01-22
Robert Carr (community)			Approve on 2015-01-20
Chris Halse Rogers		2015-01-15	Needs Fixing on 2015-01-16
Review via email: mp+246655@code.staging.launchpad.net

Commit message

Add API to create dialog and tooltip surfaces.

Description of the change

Add API to create dialog and tooltip surfaces.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-15:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2666/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2667/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-16:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/2669/rebuild

review: Approve (continuous-integration)

Revision history for this message

Chris Halse Rogers (raof) wrote on 2015-01-16:

Firstly, spec questions:
*) Huh. Why do the docs allow the client to specify the location of a dialog‽ That's surely an error.
*) Relatedly, the spec is inconsistent on whether or not dialogs can have dialog children.

Again, we need to specify input behaviour of tooltips.

And maybe something about the input behaviour of modal dialogs, but that's less complicated.

I lean towards having two spec creation functions; _spec_for_dialog_surface and _spec_for_modal_dialog_surface, *particularly* if we really do need to allow client-specified positioning of modal dialogs. _spec_for_dialog_surface has half the parameters of _spec_for_modal_dialog_surface.

Relatedly, I wonder if we should drop the “_surface” from mir_connection_create_spec_for_*_surface? They're getting a bit long.

review: Needs Fixing

Revision history for this message

Alberto Aguirre (albaguirre) wrote on 2015-01-20:

> Firstly, spec questions:
> *) Huh. Why do the docs allow the client to specify the location of a dialog‽
> That's surely an error.
It actually mentions a client specifying an optional initial position for more than dialogs so yeah doesn't belong in this dialog API.

> *) Relatedly, the spec is inconsistent on whether or not dialogs can have
> dialog children.
I could only find one sentence where it's inconsistent. However there's a full paragraph with motivation for avoiding trees of dialogs

> Again, we need to specify input behaviour of tooltips.
>
> And maybe something about the input behaviour of modal dialogs, but that's
> less complicated.
>
I added a bit of info there.

> I lean towards having two spec creation functions; _spec_for_dialog_surface
> and _spec_for_modal_dialog_surface, *particularly* if we really do need to
> allow client-specified positioning of modal dialogs. _spec_for_dialog_surface
> has half the parameters of _spec_for_modal_dialog_surface.

I think it makes sense to split them, done.

> Relatedly, I wonder if we should drop the “_surface” from
> mir_connection_create_spec_for_*_surface? They're getting a bit long.

Dropped.

Revision history for this message

Robert Carr (robertcarr) wrote on 2015-01-20:

LGTM.

Had the strange thought that maybe create_spec_for_tooltip could take an event or input device ID rather than relative position and parent...

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2015-01-20:

FAILED: Continuous integration, rev:2235
http://jenkins.qa.ubuntu.com/job/mir-ci/2721/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/942
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/904
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-vivid-amd64-ci/718/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/904
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/904/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/4006
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17247