ae59de5 · unity8 · git.iko.soy

qml/Launcher/LauncherDelegate.qml+1

compare with xenial

unifiedsplit

@@ -86,6 +86,7 @@ Item {

86

87 Label {

88 id: countLabel

89+ objectName: "countLabel"

89 text: root.count

90 text: root.count

90 anchors.centerIn: parent

91 anchors.centerIn: parent

91 // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine

92 // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1

@@ -35,6 +35,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

35 m_recent(false),

36 m_progress(-1),

37 m_count(0),

38+ m_countVisible(false),

38 m_focused(false),

39 m_focused(false),

39 m_quickList(new MockQuickListModel(this))

40 m_quickList(new MockQuickListModel(this))

40{

41{

tests/mocks/Unity/Launcher/MockLauncherModel.cpp+4

@@ -76,6 +76,8 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

76 LauncherItemInterface *item = m_list.at(index.row());

77 switch(role)

78 {

79+ case RoleAppId:

80+ return item->appId();

79 case RoleName:

81 case RoleName:

80 return item->name();

82 return item->name();

81 case RoleIcon:

83 case RoleIcon:

@@ -90,6 +92,8 @@ QVariant MockLauncherModel::data(const QModelIndex& index, int role) const

90 return item->progress();

92 return item->progress();

91 case RoleCount:

93 case RoleCount:

92 return item->count();

94 return item->count();

95+ case RoleCountVisible:

96+ return item->countVisible();

93 case RoleFocused:

97 case RoleFocused:

94 return item->focused();

98 return item->focused();

95 }

99 }

tests/qmltests/Launcher/tst_Launcher.qml+3−1

@@ -194,7 +194,9 @@ Item {

194 var launcherListView = findChild(launcher, "launcherListView");

195 for (var i = 0; i < launcherListView.count; ++i) {

196 var delegate = findChild(launcherListView, "launcherDelegate" + i)

197− compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).count > 0)

197+ compare(findChild(delegate, "countEmblem").visible, LauncherModel.get(i).countVisible)

198+ // Intentionally allow type coercion (string/number)

199+ compare(findChild(delegate, "countLabel").text == LauncherModel.get(i).count, true)

198 }

200 }

199 }

201 }

200

202