marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 15:03:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

bottom bar always visible

Browse source
This commit is contained in:
Marco Martin 2015-02-24 18:30:46 +01:00
parent dc12516834
commit 2a1e2934dc
2 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
compositor/contents/Compositor.qml
View file

@ -154,8 +154,8 @@ Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: compositorRoot.state == "homeScreen" ? 0 : bottomBarHeight height: bottomBarHeight
color: Qt.rgba(0, 0, 0, 0.9 + 0.1*windowsZoom.scale) color: Qt.rgba(0, 0, 0, 0.7)
Behavior on height { Behavior on height {
NumberAnimation { NumberAnimation {
@ -167,11 +167,32 @@ Rectangle {
RowLayout { RowLayout {
anchors.fill: parent anchors.fill: parent
PlasmaCore.IconItem {
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
width: units.iconSizes.smallMedium
height: width
source: "distribute-horizontal-x"
enabled: compositorRoot.state != "switcher";
opacity: enabled ? 1 : 0.6
Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: units.iconSizes.medium
Layout.preferredHeight: units.iconSizes.medium
MouseArea {
anchors.fill: parent
onClicked: {
compositorRoot.state = "switcher";
}
}
}
PlasmaCore.IconItem { PlasmaCore.IconItem {
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
width: units.iconSizes.smallMedium width: units.iconSizes.smallMedium
height: width height: width
source: "go-home" source: "go-home"
enabled: compositorRoot.state != "homeScreen";
opacity: enabled ? 1 : 0.6
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: units.iconSizes.medium Layout.preferredWidth: units.iconSizes.medium

13
shell/contents/views/Desktop.qml
View file

@ -312,7 +312,7 @@ Item {
right: parent.right right: parent.right
} }
height: units.iconSizes.small height: units.iconSizes.small
z: 1 z: 2
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
Rectangle { Rectangle {
@ -401,16 +401,11 @@ Item {
PlasmaCore.ColorScope { PlasmaCore.ColorScope {
z: 1 z: 1
anchors { anchors {
top: statusPanel.bottom fill: parent
bottom: parent.bottom
left: parent.left
right: parent.right
} }
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
SatelliteComponents.ApplicationListModel { SatelliteComponents.ApplicationListModel {
id: appListModel id: appListModel
} }
@ -432,7 +427,7 @@ Item {
header: MouseArea { header: MouseArea {
z: 999 z: 999
width: homescreen.width width: homescreen.width
height: homescreen.height height: homescreen.height - units.iconSizes.medium
onPressAndHold: { onPressAndHold: {
containment.action("configure").trigger(); containment.action("configure").trigger();
@ -504,7 +499,7 @@ Item {
SatelliteStripe { SatelliteStripe {
id: stripe id: stripe
z: 99 z: 99
y: Math.max(applications.contentY + parent.height, parent.height - height - statusPanel.height) y: Math.max(applications.contentY + parent.height, parent.height - height)
PlasmaCore.Svg { PlasmaCore.Svg {
id: stripeIcons id: stripeIcons