Merge lp:~nikwen/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix into lp:ubuntu-ui-toolkit/rtm

Proposed by Niklas Wenzel
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 1140
Merged at revision: 1147
Proposed branch: lp:~nikwen/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix
Merge into: lp:ubuntu-ui-toolkit/rtm
Diff against target: 11 lines (+1/-1)
1 file modified
modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml (+1/-1)
To merge this branch: bzr merge lp:~nikwen/ubuntu-ui-toolkit/actionselectionpopover-rtm-fix
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+247346@code.launchpad.net

Commit message

ActionSelectionPopover: Handle the 'visible' property of actions properly

Description of the change

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve
Revision history for this message
Niklas Wenzel (nikwen) wrote :

Thanks. :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml'
2--- modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2014-04-25 12:53:58 +0000
3+++ modules/Ubuntu/Components/Popups/ActionSelectionPopover.qml 2015-01-22 18:50:21 +0000
4@@ -120,7 +120,7 @@
5 }
6 /*! \internal */
7 onTriggered: popover.hide()
8- visible: enabled
9+ visible: enabled && ((action === undefined) || action.visible)
10 height: visible ? implicitHeight : 0
11 }
12

Subscribers

People subscribed via source and target branches

to all changes: