git.iko.soy/unity8
on xenial help sign in
removed implicit height
commitbe81ccf6818f597c3a273a6c51dc31fe5657e13f authorNick Dedekind <nicholas.dedekind@gmail.com> dateThu 27 Jun 2013, 17:08 (13 years ago) parente507710
3 files changed+2−6
compare with xenial
unifiedsplit
modules/Unity/Indicators/qml/ButtonMenuItem.qml+2−4 modules/Unity/Indicators/qml/MenuItem.qml−1 modules/Unity/Indicators/qml/SectionMenuItem.qml−1
modules/Unity/Indicators/qml/ButtonMenuItem.qml+2−4
@@ -21,16 +21,14 @@ import QtQuick 2.0
2121import Ubuntu.Components 0.1
2222
2323BasicMenuItem {
24− property variant action: menu && menu.action!="" && actionGroup ? actionGroup.action(menu.action) : null
24+ property var action: menu && menu.action != "" && actionGroup ? actionGroup.action(menu.action) : null
2525
2626 color: "#221e1b"
27− height: undefined // If we're using implicitHieght, we need to make sure height is not set.
2827 implicitHeight: units.gu(7)
2928
3029 Button {
3130 text: menu ? menu.label : ""
32− anchors.horizontalCenter: parent.horizontalCenter
33− anchors.verticalCenter: parent.verticalCenter
31+ anchors.centerIn: parent
3432 height: units.gu(4)
3533 width: units.gu(16)
3634 color: "#1b1817"
modules/Unity/Indicators/qml/MenuItem.qml−1
@@ -27,7 +27,6 @@ BasicMenuItem {
2727 progression: menu && (menu.linkSubMenu !== undefined)
2828 text: menu && menu.label ? menu.label : ""
2929 color: "#221e1c"
30− height: undefined // If we're using implicitHieght, we need to make sure height is not set.
3130 implicitHeight: units.gu(7)
3231
3332 HLine {
modules/Unity/Indicators/qml/SectionMenuItem.qml−1
@@ -31,7 +31,6 @@ BasicMenuItem {
3131 color: "#221e1b"
3232 anchors.left: parent ? parent.left : undefined
3333 anchors.right: parent ? parent.right : undefined
34− height: undefined // If we're using implicitHieght, we need to make sure height is not set.
3534 implicitHeight: label !== "" ? __header.height : 0
3635 state: count === 0 ? "EMPTY" : ""
3736