git.iko.soy/unity8
on xenial help sign in
completely drop Hud and Bttombar from Shell.qml
8f02a4bMichael Zanetti
qml/Shell.qml+3−50
compare with xenial
unifiedsplit
@@ -28,9 +28,7 @@ import "Dash"
28import "Greeter"
28import "Greeter"
29import "Launcher"
29import "Launcher"
30import "Panel"
30import "Panel"
31−import "Hud"
32import "Components"
31import "Components"
33−import "Bottombar"
34import "SideStage"
32import "SideStage"
35import "Notifications"
33import "Notifications"
36import Unity.Notifications 1.0 as NotificationBackend
34import Unity.Notifications 1.0 as NotificationBackend
@@ -403,7 +401,7 @@ FocusScope {
403
401
404 readonly property int backgroundTopMargin: -panel.panelHeight
402 readonly property int backgroundTopMargin: -panel.panelHeight
405
403
406− hides: [launcher, panel.indicators, hud]
404+ hides: [launcher, panel.indicators]
407 shown: false
405 shown: false
408 enabled: true
406 enabled: true
409 showAnimation: StandardAnimation { property: "opacity"; to: 1 }
407 showAnimation: StandardAnimation { property: "opacity"; to: 1 }
@@ -459,7 +457,7 @@ FocusScope {
459 objectName: "greeter"
457 objectName: "greeter"
460
458
461 available: true
459 available: true
462− hides: [launcher, panel.indicators, hud]
460+ hides: [launcher, panel.indicators]
463 shown: true
461 shown: true
464
462
465 defaultBackground: shell.background
463 defaultBackground: shell.background
@@ -547,7 +545,7 @@ FocusScope {
547 InputFilterArea {
545 InputFilterArea {
548 anchors.fill: parent
546 anchors.fill: parent
549 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
547 blockInput: !applicationFocused || greeter.shown || lockscreen.shown || launcher.shown
550− || panel.indicators.shown || hud.shown
548+ || panel.indicators.shown
551 }
549 }
552
550
553 Connections {
551 Connections {
@@ -609,49 +607,6 @@ FocusScope {
609 }
607 }
610 }
608 }
611
609
612− Hud {
613− id: hud
614−
615− width: parent.width > units.gu(60) ? units.gu(40) : parent.width
616− height: parent.height
617−
618− // FIXME: Temporarily disabling the hud as it'll change but we don't know how yet.
619− available: false // !greeter.shown && !panel.indicators.shown && !lockscreen.shown && edgeDemo.dashEnabled
620− shown: false
621− showAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: 0; easing.type: Easing.Linear }
622− hideAnimation: StandardAnimation { property: "y"; duration: hud.showableAnimationDuration; to: hudRevealer.closedValue; easing.type: Easing.Linear }
623−
624− Connections {
625− target: shell.applicationManager
626− onMainStageFocusedApplicationChanged: hud.hide()
627− onSideStageFocusedApplicationChanged: hud.hide()
628− }
629− }
630−
631− Revealer {
632− id: hudRevealer
633−
634− enabled: hud.shown
635− width: hud.width
636− anchors.left: hud.left
637− height: parent.height
638− target: hud.revealerTarget
639− closedValue: height
640− openedValue: 0
641− direction: Qt.RightToLeft
642− orientation: Qt.Vertical
643− handleSize: hud.handleHeight
644− onCloseClicked: target.hide()
645− }
646−
647− Bottombar {
648− id: bottombar
649− theHud: hud
650− anchors.fill: parent
651− enabled: hud.available
652− applicationIsOnForeground: applicationFocused
653− }
654−
655 InputFilterArea {
610 InputFilterArea {
656 blockInput: launcher.shown
611 blockInput: launcher.shown
657 anchors {
612 anchors {
@@ -696,8 +651,6 @@ FocusScope {
696 onShownChanged: {
651 onShownChanged: {
697 if (shown) {
652 if (shown) {
698 panel.indicators.hide()
653 panel.indicators.hide()
699− hud.hide()
700− bottombar.hide()
701 }
654 }
702 }
655 }
703 }
656 }