← Back to branch summary

~nick-dedekind/unity8/menus.local.global

« back to all changes in this revision

Viewing changes to qml/Panel/Panel.qml

  • Committer: Nick Dedekind
  • Date: 2017-01-24 13:10:08 UTC
  • Revision ID: nick.dedekind@canonical.com-20170124131008-rhr0pgcmm2813cv0
fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
qml/Panel/Panel.qml
209
209
                    Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
210
210
                    active: __applicationMenus.model
211
211
 
 
212
                    width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
 
213
 
212
214
                    property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
213
215
 
214
216
                    sourceComponent: MenuBar {
255
257
            openedHeight: root.height
256
258
            alignment: Qt.AlignLeft
257
259
            enableHint: !callHint.active && !fullscreenMode
258
 
            showOnClick: false
 
260
            showOnClick: !callHint.visible
259
261
            panelColor: panelAreaBackground.color
260
262
 
261
263
            onShowTapped: {
385
387
            }
386
388
 
387
389
            enabled: !applicationMenus.expanded
388
 
            opacity: !applicationMenus.expanded ? 1 : 0
 
390
            opacity: !callHint.visible && !applicationMenus.expanded ? 1 : 0
389
391
            Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
390
392
 
391
393
            onEnabledChanged: {