git.iko.soy/unity8
on xenial help sign in
tiny cleanup as requested by review
9729f65Michael Zanetti
tests/mocks/Unity/Application/ApplicationScreenshotProvider.cpp+4−2
compare with xenial
unifiedsplit
@@ -40,7 +40,7 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
40 QString appId = imageId.split('/').first();
40 QString appId = imageId.split('/').first();
41
41
42 ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
42 ApplicationInfo* app = static_cast<ApplicationInfo*>(m_appManager->findApplication(appId));
43− if (app == NULL) {
43+ if (app == nullptr) {
44 return QImage();
44 return QImage();
45 }
45 }
46
46
@@ -51,16 +51,18 @@ QImage ApplicationScreenshotProvider::requestImage(const QString &imageId, QSize
51 qWarning() << "failed loading app image" << filePath;
51 qWarning() << "failed loading app image" << filePath;
52 }
52 }
53
53
54− QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
55
54
56 if (app->stage() == ApplicationInfo::SideStage) {
55 if (app->stage() == ApplicationInfo::SideStage) {
57 QByteArray gus = qgetenv("GRID_UNIT_PX");
56 QByteArray gus = qgetenv("GRID_UNIT_PX");
58 image = image.scaledToWidth(gus.toInt() * 48);
57 image = image.scaledToWidth(gus.toInt() * 48);
59 } else {
58 } else {
59+ // Lets scale main stage applications to be the size of the screen/window.
60+ QGuiApplication *unity = qobject_cast<QGuiApplication*>(qApp);
60 Q_FOREACH (QWindow *win, unity->allWindows()) {
61 Q_FOREACH (QWindow *win, unity->allWindows()) {
61 QQuickWindow *quickWin = qobject_cast<QQuickWindow*>(win);
62 QQuickWindow *quickWin = qobject_cast<QQuickWindow*>(win);
62 if (quickWin) {
63 if (quickWin) {
63 image = image.scaledToWidth(quickWin->width() - m_appManager->rightMargin());
64 image = image.scaledToWidth(quickWin->width() - m_appManager->rightMargin());
65+ break;
64 }
66 }
65 }
67 }
66 }
68 }