Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons into lp:ubuntu-ui-toolkit/staging

popover-dismiss-buttons
Merge into staging

Proposed by Zsombor Egri on 2014-04-16

Status:	Merged
Approved by:	Cris Dywan on 2014-04-25
Approved revision:	1016
Merged at revision:	1022
Proposed branch:	lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons
Merge into:	lp:ubuntu-ui-toolkit/staging
Prerequisite:	lp:~zsombi/ubuntu-ui-toolkit/textinput-text-selection
Diff against target:	111 lines (+85/-0) 3 files modified modules/Ubuntu/Components/Popups/Popover.qml (+1/-0) modules/Ubuntu/Components/Popups/PopupBase.qml (+1/-0) tests/unit_x11/tst_components/tst_popover.qml (+83/-0)
To merge this branch:	bzr merge lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Cris Dywan		2014-04-16	Approve on 2014-04-25
PS Jenkins bot	continuous-integration		Approve on 2014-04-25
Review via email: mp+216006@code.launchpad.net

Commit message

Dismiss Popovers when any of the mouse buttons is pressed.

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons updated on 2014-04-17

1013. By Zsombor Egri on 2014-04-17: prereq merge

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons updated on 2014-04-17

1014. By Zsombor Egri on 2014-04-17: test fix

Revision history for this message

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

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

This looks to do the job well.

review: Approve

lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons updated on 2014-04-24

1015. By Zsombor Egri on 2014-04-24: prereq merge

Revision history for this message

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

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

review: Approve (continuous-integration)

lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons updated on 2014-04-25

1016. By Zsombor Egri on 2014-04-25: prereq sync

Revision history for this message

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

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

review: Approve (continuous-integration)

Revision history for this message

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

I can't fully run the tests due to "QIODevice::write: device not open" failing tst_expandablescolumn.qml, but it seems to work, and J likes ot.

review: Approve

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 

Tom Mirmar

Ubuntu SDK team

Zsombor Egri

 === modified file 'modules/Ubuntu/Components/Popups/Popover.qml'
 --- modules/Ubuntu/Components/Popups/Popover.qml	2014-04-20 19:25:12 +0000
 +++ modules/Ubuntu/Components/Popups/Popover.qml	2014-04-25 05:30:32 +0000
@@ -204,6 +204,7 @@
      StyledItem {
          id: foreground
++        objectName: "popover_foreground"
          //styling properties
          property real minimumWidth: units.gu(40)
 === modified file 'modules/Ubuntu/Components/Popups/PopupBase.qml'
 --- modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-20 19:25:12 +0000
 +++ modules/Ubuntu/Components/Popups/PopupBase.qml	2014-04-25 05:30:32 +0000
@@ -142,6 +142,7 @@
      InverseMouseArea {
          id: eventGrabber
          enabled: true
++        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
          anchors.fill: __foreground
          sensingArea: dismissArea
          propagateComposedEvents: !grabDismissAreaEvents
 === added file 'tests/unit_x11/tst_components/tst_popover.qml'
 --- tests/unit_x11/tst_components/tst_popover.qml	1970-01-01 00:00:00 +0000
 +++ tests/unit_x11/tst_components/tst_popover.qml	2014-04-25 05:30:32 +0000
@@ -0,0 +1,83 @@
++/*
++ * Copyright 2014 Canonical Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++import QtQuick 2.0
++import QtTest 1.0
++import Ubuntu.Test 0.1
++import Ubuntu.Components 0.1
++import Ubuntu.Components.Popups 0.1
++
++MainView {
++    id: main
++    width: units.gu(40)
++    height: units.gu(71)
++
++    Button {
++        id: caller
++        anchors.centerIn: parent
++        text: "Press me"
++        onClicked: {
++            var popover = PopupUtils.open(popoverComponent, caller);
++            popoverSpy.target = testCase.findChild(popover, "popover_foreground");
++            popoverSpy.clear();
++        }
++    }
++
++    // spy to listen on the popover foreground's hideCompleted() signal
++    SignalSpy {
++        id: popoverSpy
++        signalName: "hideCompleted"
++    }
++
++    Component {
++        id: popoverComponent
++        Popover {
++            objectName: "popover"
++            Rectangle {
++                width: units.gu(20)
++                height: units.gu(20)
++                color: "blue"
++            }
++        }
++    }
++
++    UbuntuTestCase {
++        id: testCase
++        name: "PopoverTests"
++        when: windowShown
++
++        function cleanup() {
++            popoverSpy.target = null;
++            popoverSpy.clear();
++        }
++
++        function test_dismiss_on_click_data() {
++            return [
++                        {button: Qt.LeftButton},
++                        {button: Qt.MiddleButton},
++                        {button: Qt.RightButton},
++                    ];
++        }
++
++        function test_dismiss_on_click(data) {
++            mouseClick(caller, caller.width / 2, caller.height / 2);
++            waitForRendering(caller);
++            verify(popoverSpy.target !== null, "The popover did not open");
++            // dismiss
++            mouseClick(main, 10, 10, data.button);
++            popoverSpy.wait();
++        }
++    }
++}

Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/popover-dismiss-buttons into lp:ubuntu-ui-toolkit/staging

Commit message

Description of the change

Preview Diff

Subscribers