git.iko.soy/unity8
on xenial help sign in
Do not show a "back" icon in the bfb when the drawer is open
3ba1a71Dalton Durst
qml/Launcher/Launcher.qml−3
compare with xenial
unifiedsplit
@@ -592,7 +592,6 @@ FocusScope {
592 PropertyChanges {
592 PropertyChanges {
593 target: panel
593 target: panel
594 x: -root.panelWidth
594 x: -root.panelWidth
595− showCloseIcon: false
596 }
595 }
597 PropertyChanges {
596 PropertyChanges {
598 target: drawer
597 target: drawer
@@ -605,7 +604,6 @@ FocusScope {
605 PropertyChanges {
604 PropertyChanges {
606 target: panel
605 target: panel
607 x: -root.x // so we never go past panelWidth, even when teased by tutorial
606 x: -root.x // so we never go past panelWidth, even when teased by tutorial
608− showCloseIcon: false
609 focus: true
607 focus: true
610 }
608 }
611 PropertyChanges {
609 PropertyChanges {
@@ -624,7 +622,6 @@ FocusScope {
624 }
622 }
625 PropertyChanges {
623 PropertyChanges {
626 target: panel
624 target: panel
627− showCloseIcon: true
628 }
625 }
629 },
626 },
630 State {
627 State {
qml/Launcher/LauncherPanel.qml+1−7
@@ -35,7 +35,6 @@ Rectangle {
35 property bool moving: launcherListView.moving || launcherListView.flicking
35 property bool moving: launcherListView.moving || launcherListView.flicking
36 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
36 property bool preventHiding: moving || dndArea.draggedIndex >= 0 || quickList.state === "open" || dndArea.pressed
37 || dndArea.containsMouse || dashItem.hovered
37 || dndArea.containsMouse || dashItem.hovered
38− property bool showCloseIcon: false
39 property int highlightIndex: -2
38 property int highlightIndex: -2
40 property bool shortcutHintsShown: false
39 property bool shortcutHintsShown: false
41 readonly property bool quickListOpen: quickList.state === "open"
40 readonly property bool quickListOpen: quickList.state === "open"
@@ -96,12 +95,7 @@ Rectangle {
96 width: parent.width * .6
95 width: parent.width * .6
97 height: width
96 height: width
98 anchors.centerIn: parent
97 anchors.centerIn: parent
99− source: {
100− if (root.showCloseIcon) {
101− return "/usr/share/icons/suru/actions/scalable/back.svg";
102− }
103− return "graphics/home.svg";
98+ source: "graphics/home.svg"
104− }
105 color: "white"
99 color: "white"
106 rotation: root.rotation
100 rotation: root.rotation
107 }
101 }