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

fix check state for menu items

Browse Source
This commit is contained in:
Marco Martin 2017-08-28 13:15:25 +02:00
parent ac24340877
commit b02c92fe5c
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/declarativeimports/plasmacomponents3/CheckIndicator.qml
View File

@ -37,13 +37,17 @@ PlasmaCore.FrameSvgItem {
}
elementId: "checkbox"
opacity: {
switch (control.checkState) {
case Qt.Checked:
return 1;
case Qt.PartiallyChecked:
return 0.5;
default:
return 0;
if (typeof control.checkState !== "undefined") {
switch (control.checkState) {
case Qt.Checked:
return 1;
case Qt.PartiallyChecked:
return 0.5;
default:
return 0;
}
} else {
return control.checked ? 1 : 0;
}
}
anchors {

22
src/declarativeimports/plasmacomponents3/MenuItem.qml
View File

@ -22,7 +22,7 @@ import QtQuick.Templates 2.0 as T
import org.kde.plasma.core 2.0 as PlasmaCore
T.MenuItem {
id: control
id: controlRoot
implicitWidth: Math.max(background ? background.implicitWidth : 0,
contentItem.implicitWidth + leftPadding + rightPadding)
@ -39,24 +39,24 @@ T.MenuItem {
hoverEnabled: true
contentItem: Label {
leftPadding: !control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
rightPadding: control.mirrored ? (control.indicator ? control.indicator.width : 0) + control.spacing : 0
leftPadding: !controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
rightPadding: controlRoot.mirrored ? (controlRoot.indicator ? controlRoot.indicator.width : 0) + controlRoot.spacing : 0
text: control.text
font: control.font
text: controlRoot.text
font: controlRoot.font
color: theme.textColor
elide: Text.ElideRight
visible: control.text
visible: controlRoot.text
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
}
indicator: CheckIndicator {
x: control.mirrored ? control.width - width - control.rightPadding : control.leftPadding
y: control.topPadding + (control.availableHeight - height) / 2
x: controlRoot.mirrored ? controlRoot.width - width - controlRoot.rightPadding : controlRoot.leftPadding
y: controlRoot.topPadding + (controlRoot.availableHeight - height) / 2
visible: control.checkable
checkState: control.checked ? Qt.Checked : 0
visible: controlRoot.checkable
control: controlRoot
}
background: Item {
@ -68,7 +68,7 @@ T.MenuItem {
prefix: "hover"
colorGroup: PlasmaCore.ColorScope.colorGroup
anchors.fill: parent
opacity: control.hovered && !control.pressed ? 1 : 0
opacity: controlRoot.hovered && !controlRoot.pressed ? 1 : 0
Behavior on opacity {
NumberAnimation {
duration: units.longDuration