diff --git a/containments/panel/contents/ui/SlidingPanel.qml b/containments/panel/contents/ui/SlidingPanel.qml index 61444b39..8629edd1 100644 --- a/containments/panel/contents/ui/SlidingPanel.qml +++ b/containments/panel/contents/ui/SlidingPanel.qml @@ -18,7 +18,7 @@ */ import QtQuick 2.0 -import QtQuick.Window 2.0 +import QtQuick.Window 2.2 import org.kde.plasma.core 2.0 as PlasmaCore Window { diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml index 0d520d41..fc1000c6 100644 --- a/containments/panel/contents/ui/main.qml +++ b/containments/panel/contents/ui/main.qml @@ -177,17 +177,17 @@ PlasmaCore.ColorScope { } - PlasmaWorkspace.BatteryIcon { - id: batteryIcon - anchors { - right: parent.right - verticalCenter: parent.verticalCenter - } - width: height - height: parent.height - hasBattery: pmSource.data["Battery"]["Has Battery"] - // batteryType: "Phone" - percent: pmSource.data["Battery0"] ? pmSource.data["Battery0"]["Percent"] : 0 + PlasmaWorkspace.BatteryIcon { + id: batteryIcon + anchors { + right: parent.right + verticalCenter: parent.verticalCenter + } + width: height + height: parent.height + hasBattery: pmSource.data["Battery"]["Has Battery"] + // batteryType: "Phone" + percent: pmSource.data["Battery0"] ? pmSource.data["Battery0"]["Percent"] : 0 PlasmaCore.DataSource { id: pmSource @@ -218,12 +218,11 @@ PlasmaCore.ColorScope { anchors.fill: parent onPressed: { oldMouseY = mouse.y; - slidingPanel.visible = true; + slidingPanel.visibility = Qt.WindowFullScreen; } onPositionChanged: { //var factor = (mouse.y - oldMouseY > 0) ? (1 - Math.max(0, (slidingArea.y + slidingPanel.overShoot) / slidingPanel.overShoot)) : 1 var factor = 1; - print(slidingPanel.offset +" "+ slidingPanel.height) slidingPanel.offset = slidingPanel.offset + (mouse.y - oldMouseY) * factor; oldMouseY = mouse.y; }