be81ccf · unity8 · git.iko.soy

modules/Unity/Indicators/qml/ButtonMenuItem.qml+2−4

compare with xenial

unifiedsplit

@@ -21,16 +21,14 @@ import QtQuick 2.0

21import Ubuntu.Components 0.1

22

23BasicMenuItem {

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

25

26 color: "#221e1b"

27− height: undefined // If we're using implicitHieght, we need to make sure height is not set.

28 implicitHeight: units.gu(7)

27 implicitHeight: units.gu(7)

29

28

30 Button {

29 Button {

31 text: menu ? menu.label : ""

30 text: menu ? menu.label : ""

32− anchors.horizontalCenter: parent.horizontalCenter

31+ anchors.centerIn: parent

33− anchors.verticalCenter: parent.verticalCenter

34 height: units.gu(4)

32 height: units.gu(4)

35 width: units.gu(16)

33 width: units.gu(16)

36 color: "#1b1817"

34 color: "#1b1817"

modules/Unity/Indicators/qml/MenuItem.qml−1

@@ -27,7 +27,6 @@ BasicMenuItem {

27 progression: menu && (menu.linkSubMenu !== undefined)

28 text: menu && menu.label ? menu.label : ""

29 color: "#221e1c"

30− height: undefined // If we're using implicitHieght, we need to make sure height is not set.

31 implicitHeight: units.gu(7)

30 implicitHeight: units.gu(7)

32

31

33 HLine {

32 HLine {

modules/Unity/Indicators/qml/SectionMenuItem.qml−1

@@ -31,7 +31,6 @@ BasicMenuItem {

31 color: "#221e1b"

32 anchors.left: parent ? parent.left : undefined

33 anchors.right: parent ? parent.right : undefined

34− height: undefined // If we're using implicitHieght, we need to make sure height is not set.

35 implicitHeight: label !== "" ? __header.height : 0

34 implicitHeight: label !== "" ? __header.height : 0

36 state: count === 0 ? "EMPTY" : ""

35 state: count === 0 ? "EMPTY" : ""

37

36