alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

private ButtonShadow for shadow/hover of buttons

Browse Source 
also, don't export DusalStateButton
This commit is contained in:
Marco Martin 2011-10-10 13:04:22 +02:00
parent 554399afc7
commit 94ad9f8d3f
6 changed files with 125 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
declarativeimports/plasmacomponents/qml/ButtonShadow.qml Normal file
View File

@ -0,0 +1,105 @@
/*
* Copyright (C) 2011 by Daker Fernandes Pinheiro <dakerfp@gmail.com>
* Copyright (C) 2011 by Marco Martin <mart@kde.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
* Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
import QtQuick 1.0
import org.kde.plasma.core 0.1 as PlasmaCore
Item {
id: main
state: parent.state
PlasmaCore.FrameSvgItem {
id: hover
anchors {
fill: parent
leftMargin: -margins.left
topMargin: -margins.top
rightMargin: -margins.right
bottomMargin: -margins.bottom
}
opacity: 0
imagePath: "widgets/button"
prefix: "hover"
}
PlasmaCore.FrameSvgItem {
id: shadow
anchors {
fill: parent
leftMargin: -margins.left
topMargin: -margins.top
rightMargin: -margins.right
bottomMargin: -margins.bottom
}
imagePath: "widgets/button"
prefix: "shadow"
}
states: [
State {
name: "shadow"
PropertyChanges {
target: shadow
opacity: 1
}
PropertyChanges {
target: hover
opacity: 0
prefix: "hover"
}
},
State {
name: "hover"
PropertyChanges {
target: shadow
opacity: 0
}
PropertyChanges {
target: hover
opacity: 1
prefix: "hover"
}
},
State {
name: "focus"
PropertyChanges {
target: shadow
opacity: 0
}
PropertyChanges {
target: hover
opacity: 1
prefix: "focus"
}
}
]
transitions: [
Transition {
PropertyAnimation {
properties: "opacity"
duration: 250
easing.type: Easing.OutQuad
}
}
]
}

2
declarativeimports/plasmacomponents/qml/CheckBox.qml
View File

@ -43,4 +43,6 @@ DualStateButton {
}
}
}
shadow: ButtonShadow {}
}

57
declarativeimports/plasmacomponents/qml/DualStateButton.qml
View File

@ -9,7 +9,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details
* GNU Library General Public License for more details
*
* You should have received a copy of the GNU Library General Public
* License along with this program; if not, write to the
@ -32,18 +32,18 @@ Item {
// Plasma API
property alias text: label.text // TODO: Not yet part of the common API
property QtObject theme: PlasmaCore.Theme { }
property alias view: surface.sourceComponent
property alias view: surfaceLoader.sourceComponent
property alias shadow: shadowLoader.sourceComponent
width: surface.width + label.paintedWidth
height: surface.height
width: surfaceLoader.width + label.paintedWidth
height: surfaceLoader.height
// TODO: needs to define if there will be specific graphics for
// disabled buttons
opacity: dualButton.enabled ? 1.0 : 0.5
function entered() {
if (dualButton.enabled) {
shadow.opacity = 0;
hover.opacity = 1;
shadowLoader.state = "hover"
}
}
@ -62,45 +62,13 @@ Item {
released();
}
PlasmaCore.FrameSvgItem {
id: hover
anchors {
fill: surface
leftMargin: -margins.left
topMargin: -margins.top
rightMargin: -margins.right
bottomMargin: -margins.bottom
}
opacity: 0
imagePath: "widgets/button"
prefix: "hover"
Behavior on opacity {
PropertyAnimation { duration: 250 }
}
}
PlasmaCore.FrameSvgItem {
id: shadow
anchors {
fill: surface
leftMargin: -margins.left
topMargin: -margins.top
rightMargin: -margins.right
bottomMargin: -margins.bottom
}
imagePath: "widgets/button"
prefix: "shadow"
Behavior on opacity {
PropertyAnimation { duration: 250 }
}
Loader {
id: shadowLoader
anchors.fill: surfaceLoader
}
Loader {
id: surface
id: surfaceLoader
anchors {
verticalCenter: parent.verticalCenter
@ -116,7 +84,7 @@ Item {
anchors {
top: parent.top
bottom: parent.bottom
left: surface.right
left: surfaceLoader.right
right: parent.right
// XXX: see how this margin will be set
leftMargin: hover.margins.right
@ -135,8 +103,7 @@ Item {
onEntered: dualButton.entered();
onPressed: dualButton.forceActiveFocus();
onExited: {
shadow.opacity = 1;
hover.opacity = 0;
shadowLoader.state = "shadow"
}
}
}

2
declarativeimports/plasmacomponents/qml/RadioButton.qml
View File

@ -45,4 +45,6 @@ DualStateButton {
}
}
}
shadow: ButtonShadow {}
}

4
declarativeimports/plasmacomponents/qml/Switch.qml
View File

@ -22,11 +22,15 @@ import org.kde.plasma.core 0.1 as PlasmaCore
DualStateButton {
id: switchItem
view: PlasmaCore.FrameSvgItem {
imagePath: "widgets/frame"
prefix: "sunken"
width: 32
height: 16
//not used in this control
property bool shadowVisible
PlasmaCore.FrameSvgItem {
imagePath: "widgets/button"
prefix: "normal"

1
declarativeimports/plasmacomponents/qml/qmldir
View File

@ -6,7 +6,6 @@ ButtonGroup 0.1 ButtonGroup.js
ButtonRow 0.1 ButtonRow.qml
ButtonColumn 0.1 ButtonColumn.qml
CheckBox 0.1 CheckBox.qml
DualStateButton 0.1 DualStateButton.qml
FlashingLabel 0.1 FlashingLabel.qml
Frame 0.1 Frame.qml
IconWidget 0.1 IconWidget.qml