3160af0 · unity8 · git.iko.soy

plugins/Cursor/MousePointer.cpp−1

compare with xenial

unifiedsplit

@@ -218,4 +218,3 @@ void MousePointer::setConfiningItem(QQuickItem *item)

218 Q_EMIT confiningItemChanged();

219 }

220}

221−

qml/Stage/WorkspacePreview.qml+1−1

@@ -123,7 +123,7 @@ UbuntuShape {

123 property real progress: 0.5

124 property int lineWidth: units.dp(4)

125 onProgressChanged: {

126− requestPaint()

126+ requestPaint();

127 }

128

129 rotation: -90

src/ApplicationArguments.h+1

@@ -36,6 +36,7 @@ class ApplicationArguments : public QObject,

36 Q_PROPERTY(QSize windowGeometry READ windowGeometry CONSTANT)

37 Q_PROPERTY(bool hasTestability READ hasTestability CONSTANT)

38 Q_PROPERTY(bool hasFrameless READ hasFrameless CONSTANT)

39+ Q_PROPERTY(bool hasFullscreen READ hasFullscreen CONSTANT)

39#ifdef UNITY8_ENABLE_TOUCH_EMULATION

40#ifdef UNITY8_ENABLE_TOUCH_EMULATION

40 Q_PROPERTY(bool hasMouseToTouch READ hasMouseToTouch CONSTANT)

41 Q_PROPERTY(bool hasMouseToTouch READ hasMouseToTouch CONSTANT)

41#endif

42#endif

src/ShellApplication.cpp+6−7

@@ -69,6 +69,7 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

69 textdomain("unity8");

70

71 m_qmlEngine->rootContext()->setContextProperty(QStringLiteral("applicationArguments"), &m_qmlArgs);

72+ m_qmlEngine->rootContext()->setContextProperty("DebuggingController", new DebuggingController(this));

72

73

73 QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");

74 QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");

74 bool ok;

75 bool ok;

@@ -87,22 +88,20 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

87 }

88 }

88 #endif

89 #endif

89

90

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) {

93// QSize primaryScreenSize = this->primaryScreen()->size();

92// QSize primaryScreenSize = this->primaryScreen()->size();

94// m_shellView->setHeight(primaryScreenSize.height());

93// m_shellView->setHeight(primaryScreenSize.height());

95// m_shellView->setWidth(primaryScreenSize.width());

94// m_shellView->setWidth(primaryScreenSize.width());

96// m_shellView->show();

95// m_shellView->show();

97// m_shellView->requestActivate();

96// m_shellView->requestActivate();

98−// if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {

97+ if (!QProcess::startDetached("initctl emit --no-wait unity8-greeter-started")) {

99−// qDebug() << "Unable to send unity8-greeter-started event to Upstart";

98+ qDebug() << "Unable to send unity8-greeter-started event to Upstart";

100−// }

99+ }

101// } else if (isMirServer || parser.hasFullscreen()) {

100// } else if (isMirServer || parser.hasFullscreen()) {

102// m_shellView->showFullScreen();

101// m_shellView->showFullScreen();

103// } else {

102// } else {

104// m_shellView->show();

103// m_shellView->show();

105−// }

104+ }

106}

105}

107

106

108ShellApplication::~ShellApplication()

107ShellApplication::~ShellApplication()

tests/mocks/Unity/Screens/screens.cpp+4

@@ -111,3 +111,7 @@ int Screens::count() const

111{

112 return m_screenList.size();

113}

114+

115+void Screens::activateScreen(int)

116+{

117+}

tests/mocks/Unity/Screens/screens.h+3

@@ -78,6 +78,9 @@ public:

78

79 int count() const;

80

81+public Q_SLOTS:

82+ void activateScreen(int index);

83+

81Q_SIGNALS:

84Q_SIGNALS:

82 void countChanged();

85 void countChanged();

83 void screenAdded(QScreen *screen);

86 void screenAdded(QScreen *screen);