a86209f · unity8 · git.iko.soy

qml/Dash/ScopesListCategoryItem.qml+3−2

compare with xenial

unifiedsplit

@@ -61,12 +61,12 @@ MouseArea {

61 anchors {

62 left: shape.right

63 leftMargin: units.gu(1)

64− right: starArea.right

64+ right: starArea.left

65− rightMargin: units.gu(1)

66 verticalCenter: parent.verticalCenter

65 verticalCenter: parent.verticalCenter

67 }

66 }

68 Label {

67 Label {

69 id: titleLabel

68 id: titleLabel

69+ Layout.fillWidth: true

70 elide: Text.ElideRight

71 wrapMode: Text.Wrap

72 maximumLineCount: 1

@@ -74,6 +74,7 @@ MouseArea {

74 }

75 Label {

76 id: subtitleLabel

77+ Layout.fillWidth: true

77 elide: Text.ElideRight

78 elide: Text.ElideRight

78 fontSize: "xx-small"

79 fontSize: "xx-small"

79 wrapMode: Text.Wrap

80 wrapMode: Text.Wrap

tests/mocks/Unity/fake_scopes.cpp+1−1

@@ -52,7 +52,7 @@ void Scopes::updateScopes()

52 addScope(new Scope("MockScope1", "People", true, this));

53 addScope(new Scope("MockScope2", "Music", false, this));

54 addScope(new Scope("clickscope", "Apps", true, this));

55− addScope(new Scope("MockScope5", "Videos", true, this));

55+ addScope(new Scope("MockScope5", "Videos this is long ab cd ef gh ij kl", true, this));

56 addScope(new Scope("SingleCategoryScope", "Single", true, this, 1));

57 addScope(new Scope("MockScope4", "MS4", true, this));

58 addScope(new Scope("MockScope6", "MS6", true, this));

tests/mocks/Unity/fake_scopesoverview.cpp+1−1

@@ -305,7 +305,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co

305 case RoleTitle:

306 return scope ? scope->name() : QString("Title.%1.%2").arg(categoryId()).arg(index.row());

307 case RoleSubtitle:

308− return scope && scope->name() == "Videos" ? "tube, movies, cinema" : QString();

308+ return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();

309 case RoleArt:

310 return qmlDirectory() + "graphics/applicationIcons/dash.png";

311 case RoleMascot: