git.iko.soy/unity8
on xenial help sign in
remove application exposure
2112416Nick Dedekind
qml/Stages/SpreadDelegate.qml+1−1
compare with xenial
unifiedsplit
@@ -40,7 +40,7 @@ Item {
40 objectName: "surfaceContainer"
40 objectName: "surfaceContainer"
41 anchors.fill: parent
41 anchors.fill: parent
42 surface: model.surface
42 surface: model.surface
43− promptSurfaces: model.application.promptSurfaces
43+ promptSurfaces: model.promptSurfaces
44
44
45 Binding {
45 Binding {
46 target: surfaceContainer.surface
46 target: surfaceContainer.surface
tests/mocks/Unity/Application/ApplicationManager.cpp+3−3
@@ -47,7 +47,7 @@ ApplicationManager::ApplicationManager(QObject *parent)
47{
47{
48 m_roleNames.insert(RoleSurface, "surface");
48 m_roleNames.insert(RoleSurface, "surface");
49 m_roleNames.insert(RoleFullscreen, "fullscreen");
49 m_roleNames.insert(RoleFullscreen, "fullscreen");
50− m_roleNames.insert(RoleApplication, "application");
50+ m_roleNames.insert(RolePromptSurfaces, "promptSurfaces");
51
51
52 buildListOfAvailableApplications();
52 buildListOfAvailableApplications();
53
53
@@ -89,8 +89,8 @@ QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
89 return QVariant::fromValue(app->surface());
89 return QVariant::fromValue(app->surface());
90 case RoleFullscreen:
90 case RoleFullscreen:
91 return app->fullscreen();
91 return app->fullscreen();
92− case RoleApplication:
92+ case RolePromptSurfaces:
93− return QVariant::fromValue(app);
93+ return QVariant::fromValue(app->promptSurfaces());
94 default:
94 default:
95 return QVariant();
95 return QVariant();
96 }
96 }
tests/mocks/Unity/Application/ApplicationManager.h+1−1
@@ -53,7 +53,7 @@ class ApplicationManager : public ApplicationManagerInterface {
53 enum MoreRoles {
53 enum MoreRoles {
54 RoleSurface = RoleScreenshot+1,
54 RoleSurface = RoleScreenshot+1,
55 RoleFullscreen,
55 RoleFullscreen,
56− RoleApplication,
56+ RolePromptSurfaces,
57 };
57 };
58 enum Role {
58 enum Role {
59 Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
59 Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,