diff --git a/dialer/package/contents/ui/Dialpad/DialerButton.qml b/dialer/package/contents/ui/Dialpad/DialerButton.qml index b3a6c770..890a96af 100644 --- a/dialer/package/contents/ui/Dialpad/DialerButton.qml +++ b/dialer/package/contents/ui/Dialpad/DialerButton.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 2.0 +import QtQuick 2.4 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents @@ -39,7 +39,22 @@ PlasmaComponents.Label { property var pressedCallback property var releasedCallback + Rectangle { + anchors.fill: parent + z: -1 + color: PlasmaCore.ColorScope.highlightColor + radius: units.smallSpacing + opacity: mouse.pressed ? 0.4 : 0 + Behavior on opacity { + OpacityAnimator { + duration: units.longDuration + easing.type: Easing.InOutQuad + } + } + } + MouseArea { + id: mouse anchors.fill: parent onPressed: { if (pressedCallback) { diff --git a/dialer/package/contents/ui/Dialpad/DialerIconButton.qml b/dialer/package/contents/ui/Dialpad/DialerIconButton.qml index 29be828b..a88a5280 100644 --- a/dialer/package/contents/ui/Dialpad/DialerIconButton.qml +++ b/dialer/package/contents/ui/Dialpad/DialerIconButton.qml @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import QtQuick 2.0 +import QtQuick 2.4 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents @@ -36,6 +36,20 @@ Item { property alias source: icon.source property alias text: label.text + Rectangle { + anchors.fill: parent + z: -1 + color: PlasmaCore.ColorScope.highlightColor + radius: units.smallSpacing + opacity: mouse.pressed ? 0.4 : 0 + Behavior on opacity { + OpacityAnimator { + duration: units.longDuration + easing.type: Easing.InOutQuad + } + } + } + Row { anchors.centerIn: parent PlasmaCore.IconItem { @@ -54,6 +68,7 @@ Item { } MouseArea { + id: mouse anchors.fill: parent onClicked: { if (callback) { diff --git a/dialer/package/contents/ui/main.qml b/dialer/package/contents/ui/main.qml index b82403cd..39ec3dca 100644 --- a/dialer/package/contents/ui/main.qml +++ b/dialer/package/contents/ui/main.qml @@ -134,7 +134,6 @@ ApplicationWindow { ) historyModel.remove(index); - } //END FUNCTIONS