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

uniform bottom and top bar

Browse source
This commit is contained in:
Marco Martin 2015-02-24 19:29:50 +01:00
parent 2a1e2934dc
commit 5b39069d98
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
compositor/contents/Compositor.qml
View file

@ -155,7 +155,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: bottomBarHeight height: bottomBarHeight
color: Qt.rgba(0, 0, 0, 0.7) color: Qt.rgba(0, 0, 0, 0.9)
Behavior on height { Behavior on height {
NumberAnimation { NumberAnimation {
@ -172,8 +172,8 @@ Rectangle {
width: units.iconSizes.smallMedium width: units.iconSizes.smallMedium
height: width height: width
source: "distribute-horizontal-x" source: "distribute-horizontal-x"
enabled: compositorRoot.state != "switcher"; enabled: compositorRoot.state != "switcher" && windowsLayout.children.length > 0
opacity: enabled ? 1 : 0.6 opacity: enabled ? 1 : 0.2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: units.iconSizes.medium Layout.preferredWidth: units.iconSizes.medium
@ -192,7 +192,7 @@ Rectangle {
height: width height: width
source: "go-home" source: "go-home"
enabled: compositorRoot.state != "homeScreen"; enabled: compositorRoot.state != "homeScreen";
opacity: enabled ? 1 : 0.6 opacity: enabled ? 1 : 0.2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: units.iconSizes.medium Layout.preferredWidth: units.iconSizes.medium
@ -211,7 +211,7 @@ Rectangle {
height: width height: width
source: "window-close" source: "window-close"
enabled: compositorRoot.currentWindow enabled: compositorRoot.currentWindow
opacity: enabled ? 1 : 0.6 opacity: enabled ? 1 : 0.2
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.preferredWidth: units.iconSizes.medium Layout.preferredWidth: units.iconSizes.medium

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

@ -209,7 +209,7 @@ Item {
Rectangle { Rectangle {
z: 1 z: 1
color: Qt.rgba(0, 0, 0, 0.7 * (Math.min(applications.contentY + homescreen.height, homescreen.height) / homescreen.height)) color: Qt.rgba(0, 0, 0, 0.9 * (Math.min(applications.contentY + homescreen.height, homescreen.height) / homescreen.height))
anchors.fill: parent anchors.fill: parent
} }
@ -317,7 +317,7 @@ Item {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
color: Qt.rgba(0, 0, 0, 0.7) color: Qt.rgba(0, 0, 0, 0.9)
PlasmaCore.IconItem { PlasmaCore.IconItem {
id: strengthIcon id: strengthIcon
@ -398,6 +398,7 @@ Item {
height: homescreen.height height: homescreen.height
} }
PlasmaCore.ColorScope { PlasmaCore.ColorScope {
z: 1 z: 1
anchors { anchors {
@ -458,7 +459,7 @@ Item {
right: parent.right right: parent.right
bottomMargin: stripe.height * 2 bottomMargin: stripe.height * 2
} }
height: contentHeight height: parent.height / 3
interactive: false interactive: false
z: 1 z: 1
@ -474,17 +475,17 @@ Item {
} }
remove: Transition { remove: Transition {
NumberAnimation { NumberAnimation {
properties: "x" properties: "x"
to: notificationView.width to: notificationView.width
duration: 500 duration: 500
}
NumberAnimation {
properties: "opacity"
to: 0
duration: 500
}
} }
NumberAnimation {
properties: "opacity"
to: 0
duration: 500
}
}
removeDisplaced: Transition { removeDisplaced: Transition {
SequentialAnimation { SequentialAnimation {