git.iko.soy/unity8
on xenial help sign in
merge prereq
commit3160af0b12d643255f4d693b9b47ece455ae82fc authorMichael Zanetti <michael.zanetti@canonical.com> dateMon 23 Jan 2017, 15:09 (10 years ago) parent23f461e0487745
6 files changed+15−9
compare with xenial
unifiedsplit
plugins/Cursor/MousePointer.cpp−1 qml/Stage/WorkspacePreview.qml+1−1 src/ApplicationArguments.h+1 src/ShellApplication.cpp+6−7 tests/mocks/Unity/Screens/screens.cpp+4 tests/mocks/Unity/Screens/screens.h+3
plugins/Cursor/MousePointer.cpp−1
@@ -218,4 +218,3 @@ void MousePointer::setConfiningItem(QQuickItem *item)
218218 Q_EMIT confiningItemChanged();
219219 }
220220}
221−
qml/Stage/WorkspacePreview.qml+1−1
@@ -123,7 +123,7 @@ UbuntuShape {
123123 property real progress: 0.5
124124 property int lineWidth: units.dp(4)
125125 onProgressChanged: {
126− requestPaint()
126+ requestPaint();
127127 }
128128
129129 rotation: -90
src/ApplicationArguments.h+1
@@ -36,6 +36,7 @@ class ApplicationArguments : public QObject,
3636 Q_PROPERTY(QSize windowGeometry READ windowGeometry CONSTANT)
3737 Q_PROPERTY(bool hasTestability READ hasTestability CONSTANT)
3838 Q_PROPERTY(bool hasFrameless READ hasFrameless CONSTANT)
39+ Q_PROPERTY(bool hasFullscreen READ hasFullscreen CONSTANT)
3940#ifdef UNITY8_ENABLE_TOUCH_EMULATION
4041 Q_PROPERTY(bool hasMouseToTouch READ hasMouseToTouch CONSTANT)
4142#endif
src/ShellApplication.cpp+6−7
@@ -69,6 +69,7 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
6969 textdomain("unity8");
7070
7171 m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("applicationArguments"), &m_qmlArgs);
72+ m_qmlEngine->rootContext()->setContextProperty("DebuggingController", new DebuggingController(this));
7273
7374 QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");
7475 bool ok;
@@ -87,22 +88,20 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
8788 }
8889 #endif
8990
90− m_qmlEngine->rootContext()->setContextProperty("DebuggingController", new DebuggingController(this));
91−
92−// if (parser.mode().compare("greeter") == 0) {
91+ if (m_qmlArgs.mode().compare("greeter") == 0) {
9392// QSize primaryScreenSize = this->primaryScreen()->size();
9493// m_shellView->setHeight(primaryScreenSize.height());
9594// m_shellView->setWidth(primaryScreenSize.width());
9695// m_shellView->show();
9796// m_shellView->requestActivate();
98−// if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {
99−// qDebug() << "Unable to send unity8-greeter-started event to Upstart";
100−// }
97+ if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {
98+ qDebug() << "Unable to send unity8-greeter-started event to Upstart";
99+ }
101100// } else if (isMirServer || parser.hasFullscreen()) {
102101// m_shellView->showFullScreen();
103102// } else {
104103// m_shellView->show();
105−// }
104+ }
106105}
107106
108107ShellApplication::~ShellApplication()
tests/mocks/Unity/Screens/screens.cpp+4
@@ -111,3 +111,7 @@ int Screens::count() const
111111{
112112 return m_screenList.size();
113113}
114+
115+void Screens::activateScreen(int)
116+{
117+}
tests/mocks/Unity/Screens/screens.h+3
@@ -78,6 +78,9 @@ public:
7878
7979 int count() const;
8080
81+public Q_SLOTS:
82+ void activateScreen(int index);
83+
8184Q_SIGNALS:
8285 void countChanged();
8386 void screenAdded(QScreen *screen);