xenial...84a5759 · unity8

plugins/Cursor/CMakeLists.txt+1

@@ -15,6 +15,7 @@ set(QMLPLUGIN_SRC

1515 CursorImageInfo.cpp

1616 CursorImageProvider.cpp

1717 MousePointer.cpp

18+ InputDispatcherFilter.cpp

1819 # We need to run moc on this header

1920 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirMousePointerInterface.h

2021 )

plugins/Cursor/InputDispatcherFilter.cppnew file+146

@@ -0,0 +1,146 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "InputDispatcherFilter.h"

18+#include "MousePointer.h"

19+

20+#include <QEvent>

21+#include <QGuiApplication>

22+#include <QScreen>

23+#include <qpa/qplatformnativeinterface.h>

24+#include <qpa/qplatformscreen.h>

25+

26+InputDispatcherFilter *InputDispatcherFilter::instance()

27+{

28+ static InputDispatcherFilter filter;

29+ return &filter;

30+}

31+

32+InputDispatcherFilter::InputDispatcherFilter(QObject *parent)

33+ : QObject(parent)

34+{

35+ QPlatformNativeInterface *ni = QGuiApplication::platformNativeInterface();

36+ m_inputDispatcher = static_cast<QObject*>(ni->nativeResourceForIntegration("InputDispatcher"));

37+ if (m_inputDispatcher) {

38+ m_inputDispatcher->installEventFilter(this);

39+ }

40+}

41+

42+void InputDispatcherFilter::registerPointer(MousePointer *pointer)

43+{

44+ // allow first registered pointer to be visible.

45+ pointer->setVisible(m_pointers.count() == 0);

46+

47+ m_pointers.insert(pointer);

48+ connect(pointer, &MousePointer::mouseMoved, this, [this, pointer]() {

49+ Q_FOREACH(auto p, m_pointers) {

50+ p->setVisible(p == pointer);

51+ }

52+ });

53+}

54+

55+void InputDispatcherFilter::unregisterPointer(MousePointer *pointer)

56+{

57+ m_pointers.remove(pointer);

58+ disconnect(pointer, &MousePointer::mouseMoved, this, 0);

59+}

60+

61+void InputDispatcherFilter::setPosition(const QPointF &pos)

62+{

63+ mousePosition = pos;

64+}

65+

66+bool InputDispatcherFilter::eventFilter(QObject *o, QEvent *e)

67+{

68+ if (o != m_inputDispatcher) return false;

69+

70+ switch (e->type()) {

71+ case QEvent::MouseMove:

72+ case QEvent::MouseButtonPress:

73+ case QEvent::MouseButtonRelease:

74+ {

75+ // FIXME - removed all input filtering for now - this was for extended display

76+ return false;

77+

78+// QMouseEvent* me = static_cast<QMouseEvent*>(e);

79+

80+// // Local position gives relative change of mouse pointer.

81+// QPointF localPos = me->localPos();

82+// QPointF globalPos = me->screenPos();

83+

84+// // Adjust the position

85+// QPointF oldPos(mousePosition.isNull() ? globalPos : mousePosition);

86+// QPointF newPos = adjustedPositionForMovement(oldPos, localPos);

87+

88+// QScreen* currentScreen = screenAt(newPos);

89+// if (currentScreen) {

90+// QRect screenRect = currentScreen->geometry();

91+// qreal unadjustedX = (oldPos + localPos).x();

92+// if (unadjustedX < screenRect.left()) {

93+// Q_EMIT pushedLeftBoundary(currentScreen, qAbs(unadjustedX - screenRect.left()), me->buttons());

94+// } else if (unadjustedX > screenRect.right()) {

95+// Q_EMIT pushedRightBoundary(currentScreen, qAbs(unadjustedX - screenRect.right()), me->buttons());

96+// }

97+// }

98+

99+// // Send the event

100+// QMouseEvent eCopy(me->type(), me->localPos(), newPos, me->button(), me->buttons(), me->modifiers());

101+// eCopy.setTimestamp(me->timestamp());

102+// o->event(&eCopy);

103+// return true;

104+ }

105+ default:

106+ break;

107+ }

108+ return false;

109+}

110+

111+QPointF InputDispatcherFilter::adjustedPositionForMovement(const QPointF &pt, const QPointF &movement) const

112+{

113+ QPointF adjusted = pt + movement;

114+

115+ auto screen = screenAt(adjusted); // first check if our move was to a valid screen.

116+ if (screen) {

117+ return adjusted;

118+ } else if ((screen = screenAt(pt))) { // then check if our old position was valid

119+ QRectF screenBounds = screen->geometry();

120+ // bound the new position to the old screen geometry

121+ adjusted.rx() = qMax(screenBounds.left(), qMin(adjusted.x(), screenBounds.right()-1));

122+ adjusted.ry() = qMax(screenBounds.top(), qMin(adjusted.y(), screenBounds.bottom()-1));

123+ } else {

124+ auto screens = QGuiApplication::screens();

125+

126+ // center of first screen with a pointer.

127+ Q_FOREACH(QScreen* screen, screens) {

128+ Q_FOREACH(MousePointer* pointer, m_pointers) {

129+ if (pointer->screen() == screen) {

130+ return screen->geometry().center();

131+ }

132+ }

133+ }

134+ }

135+ return adjusted;

136+}

137+

138+QScreen *InputDispatcherFilter::screenAt(const QPointF &pt) const

139+{

140+ Q_FOREACH(MousePointer* pointer, m_pointers) {

141+ QScreen* screen = pointer->screen();

142+ if (screen && screen->geometry().contains(pt.toPoint()))

143+ return screen;

144+ }

145+ return nullptr;

146+}

plugins/Cursor/InputDispatcherFilter.hnew file+57

@@ -0,0 +1,57 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef INPUTDISPATCHERFILTER_H

18+#define INPUTDISPATCHERFILTER_H

19+

20+#include <QObject>

21+#include <QPointF>

22+#include <QSet>

23+

24+class MousePointer;

25+class QScreen;

26+

27+class InputDispatcherFilter : public QObject

28+{

29+ Q_OBJECT

30+public:

31+ static InputDispatcherFilter *instance();

32+

33+ void registerPointer(MousePointer* pointer);

34+

35+ void unregisterPointer(MousePointer* pointer);

36+

37+ void setPosition(const QPointF &pos);

38+

39+Q_SIGNALS:

40+ void pushedLeftBoundary(QScreen* screen, qreal amount, Qt::MouseButtons buttons);

41+ void pushedRightBoundary(QScreen* screen, qreal amount, Qt::MouseButtons buttons);

42+

43+protected:

44+ InputDispatcherFilter(QObject* parent = nullptr);

45+

46+ bool eventFilter(QObject *o, QEvent *e) override;

47+

48+ QPointF adjustedPositionForMovement(const QPointF& pt, const QPointF& movement) const;

49+ QScreen* screenAt(const QPointF& pt) const;

50+

51+private:

52+ QObject* m_inputDispatcher;

53+ QSet<MousePointer*> m_pointers;

54+ QPointF mousePosition;

55+};

56+

57+#endif // INPUTDISPATCHERFILTER_H

plugins/Cursor/MousePointer.cpp+40−73

@@ -16,84 +16,57 @@

1616

1717#include "MousePointer.h"

1818#include "CursorImageProvider.h"

19−

20−// Unity API

21−#include <unity/shell/application/MirPlatformCursor.h>

19+#include "InputDispatcherFilter.h"

2220

2321#include <QQuickWindow>

24−#include <QGuiApplication>

25−#include <QtMath>

2622

27−#include <qpa/qwindowsysteminterface.h>

23+// Unity API

24+#include <unity/shell/application/MirPlatformCursor.h>

2825

2926MousePointer::MousePointer(QQuickItem *parent)

3027 : MirMousePointerInterface(parent)

3128 , m_cursorName(QStringLiteral("left_ptr"))

3229 , m_themeName(QStringLiteral("default"))

3330{

34−}

31+ InputDispatcherFilter::instance()->registerPointer(this);

3532

36−void MousePointer::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

37− Qt::KeyboardModifiers modifiers)

38−{

39− if (!parentItem()) {

40− return;

41− }

42−

43− if (!movement.isNull()) {

33+ auto mouseMovedFunc = [this]() {

34+ if (!isEnabled() || !window()) return;

35+ QPointF globalPosition = mapToItem(nullptr, QPointF(0, 0));

36+ InputDispatcherFilter::instance()->setPosition(globalPosition);

4437 Q_EMIT mouseMoved();

45− }

46−

47− m_accumulatedMovement += movement;

48− // don't apply the fractional part

49− QPointF appliedMovement(int(m_accumulatedMovement.x()), int(m_accumulatedMovement.y()));

50− m_accumulatedMovement -= appliedMovement;

51−

52− qreal newX = x() + appliedMovement.x();

53− qreal newY = y() + appliedMovement.y();

54− const qreal sceneWidth = parentItem()->width();

55− const qreal sceneHeight = parentItem()->height();

56−

57− if (newX <= 0 && newY < m_topBoundaryOffset) { // top left corner

58− const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-m_topBoundaryOffset, 2));

59− Q_EMIT pushedTopLeftCorner(qAbs(distance), buttons);

60− m_pushing = true;

61− } else if (newX >= sceneWidth-1 && newY < m_topBoundaryOffset) { // top right corner

62− const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-m_topBoundaryOffset, 2));

63− Q_EMIT pushedTopRightCorner(qAbs(distance), buttons);

64− m_pushing = true;

65− } else if (newX < 0 && newY >= sceneHeight-1) { // bottom left corner

66− const auto distance = qSqrt(qPow(newX, 2) + qPow(newY-sceneHeight, 2));

67− Q_EMIT pushedBottomLeftCorner(qAbs(distance), buttons);

68− m_pushing = true;

69− } else if (newX >= sceneWidth-1 && newY >= sceneHeight-1) { // bottom right corner

70− const auto distance = qSqrt(qPow(newX-sceneWidth, 2) + qPow(newY-sceneHeight, 2));

71− Q_EMIT pushedBottomRightCorner(qAbs(distance), buttons);

72− m_pushing = true;

73− } else if (newX < 0) { // left edge

74− Q_EMIT pushedLeftBoundary(qAbs(newX), buttons);

75− m_pushing = true;

76− } else if (newX >= sceneWidth) { // right edge

77− Q_EMIT pushedRightBoundary(newX - (sceneWidth - 1), buttons);

78− m_pushing = true;

79− } else if (newY < m_topBoundaryOffset) { // top edge

80− Q_EMIT pushedTopBoundary(qAbs(newY - m_topBoundaryOffset), buttons);

81− m_pushing = true;

82− } else if (Q_LIKELY(newX > 0 && newX < sceneWidth-1 && newY > 0 && newY < sceneHeight-1)) { // normal pos, not pushing

83− if (m_pushing) {

84− Q_EMIT pushStopped();

85− m_pushing = false;

38+ };

39+ connect(this, &QQuickItem::xChanged, this, mouseMovedFunc);

40+ connect(this, &QQuickItem::yChanged, this, mouseMovedFunc);

41+

42+ connect(this, &QQuickItem::enabledChanged, this, [this]() {

43+ if (!isEnabled()) setVisible(false);

44+ });

45+

46+ connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedLeftBoundary,

47+ this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {

48+ if (window() && window()->screen() == screen) {

49+ Q_EMIT pushedLeftBoundary(amount, buttons);

8650 }

87− }

51+ });

8852

89− applyItemConfinement(newX, newY);

53+ connect(InputDispatcherFilter::instance(), &InputDispatcherFilter::pushedRightBoundary,

54+ this, [this](QScreen* screen, qreal amount, Qt::MouseButtons buttons) {

55+ if (window() && window()->screen() == screen) {

56+ Q_EMIT pushedRightBoundary(amount, buttons);

57+ }

58+ });

59+}

9060

91− setX(qBound(0.0, newX, sceneWidth - 1));

92− setY(qBound(0.0, newY, sceneHeight - 1));

61+MousePointer::~MousePointer()

62+{

63+ registerScreen(nullptr);

64+ InputDispatcherFilter::instance()->unregisterPointer(this);

65+}

9366

94− QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));

95− QWindowSystemInterface::handleMouseEvent(window(), timestamp, scenePosition /*local*/, scenePosition /*global*/,

96− buttons, modifiers);

67+void MousePointer::handleMouseEvent(ulong /*timestamp*/, QPointF /*movement*/, Qt::MouseButtons /*buttons*/,

68+ Qt::KeyboardModifiers /*modifiers*/)

69+{

9770}

9871

9972void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)

@@ -121,15 +94,8 @@ void MousePointer::applyItemConfinement(qreal &newX, qreal &newY)

12194 }

12295}

12396

124−void MousePointer::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)

97+void MousePointer::handleWheelEvent(ulong /*timestamp*/, QPoint /*angleDelta*/, Qt::KeyboardModifiers /*modifiers*/)

12598{

126− if (!parentItem()) {

127− return;

128− }

129−

130− QPointF scenePosition = mapToItem(nullptr, QPointF(0, 0));

131− QWindowSystemInterface::handleWheelEvent(window(), timestamp, scenePosition /* local */, scenePosition /* global */,

132− QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);

13399}

134100

135101int MousePointer::topBoundaryOffset() const

@@ -182,7 +148,7 @@ void MousePointer::registerScreen(QScreen *screen)

182148 if (m_registeredScreen) {

183149 auto previousCursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

184150 if (previousCursor) {

185− previousCursor->setMousePointer(nullptr);

151+ previousCursor->unregisterMousePointer(this);

186152 } else {

187153 qCritical("QPlatformCursor is not a MirPlatformCursor! Cursor module only works in a Mir server.");

188154 }

@@ -193,7 +159,7 @@ void MousePointer::registerScreen(QScreen *screen)

193159 if (m_registeredScreen) {

194160 auto cursor = dynamic_cast<MirPlatformCursor*>(m_registeredScreen->handle()->cursor());

195161 if (cursor) {

196− cursor->setMousePointer(this);

162+ cursor->registerMousePointer(this);

197163 } else {

198164 qCritical("QPlaformCursor is not a MirPlatformCursor! Cursor module only works in Mir.");

199165 }

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

233199 Q_EMIT confiningItemChanged();

234200 }

235201}

202+

plugins/Cursor/MousePointer.h+4

@@ -31,6 +31,7 @@ class MousePointer : public MirMousePointerInterface {

3131 Q_PROPERTY(int topBoundaryOffset READ topBoundaryOffset WRITE setTopBoundaryOffset NOTIFY topBoundaryOffsetChanged)

3232public:

3333 MousePointer(QQuickItem *parent = nullptr);

34+ ~MousePointer();

3435

3536 void setCursorName(const QString &qtCursorName) override;

3637 QString cursorName() const override { return m_cursorName; }

@@ -46,6 +47,8 @@ public:

4647 int topBoundaryOffset() const;

4748 void setTopBoundaryOffset(int topBoundaryOffset);

4849

50+ QScreen* screen() const { return m_registeredScreen; }

51+

4952public Q_SLOTS:

5053 void handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,

5154 Qt::KeyboardModifiers modifiers) override;

@@ -90,3 +93,4 @@ private:

9093};

9194

9295#endif // MOUSEPOINTER_H

96+

plugins/UInput/plugin.cpp+7−1

@@ -19,8 +19,14 @@

1919

2020#include <QtQml/qqml.h>

2121

22+

23+QObject* uinputSingleton(QQmlEngine*, QJSEngine*)

24+{

25+ return new UInput;

26+}

27+

2228void UInputPlugin::registerTypes(const char *uri)

2329{

2430 Q_ASSERT(uri == QLatin1String("UInput"));

25− qmlRegisterType<UInput>(uri, 0, 1, "UInput");

31+ qmlRegisterSingletonType<UInput>(uri, 0, 1, "UInput", uinputSingleton);

2632}

qml/CMakeLists.txt+1−1

@@ -1,4 +1,4 @@

1−file(GLOB QML_JS_FILES *.qml *.js)

1+file(GLOB QML_JS_FILES *.qml *.js qmldir)

22

33install(FILES ${QML_JS_FILES}

44 DESTINATION ${SHELL_APP_DIR}

qml/Components/PanelState/PanelState.qml−1

@@ -14,7 +14,6 @@

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1515 */

1616

17−pragma Singleton

1817import QtQuick 2.4

1918

2019QtObject {

qml/Components/PanelState/qmldir+1−1

@@ -1 +1 @@

1−singleton PanelState 1.0 PanelState.qml

1+PanelState 1.0 PanelState.qml

qml/Components/VirtualTouchPad.qml+13−19

@@ -24,16 +24,14 @@ import "../Components"

2424

2525Item {

2626 id: root

27− property var uinput: UInput {

28− Component.onCompleted: createMouse();

29− Component.onDestruction: removeMouse();

30− }

3127

3228 Component.onCompleted: {

29+ UInput.createMouse();

3330 if (!settings.touchpadTutorialHasRun) {

3431 root.runTutorial()

3532 }

3633 }

34+ Component.onDestruction: UInput.removeMouse()

3735

3836 function runTutorial() {

3937 // If the tutorial animation is started too early, e.g. in Component.onCompleted,

@@ -85,7 +83,7 @@ Item {

8583 if (((point1.pressed && !point2.pressed) || (!point1.pressed && point2.pressed))

8684 && clickTimer.running) {

8785 clickTimer.stop();

88− uinput.pressMouse(UInput.ButtonLeft)

86+ UInput.pressMouse(UInput.ButtonLeft)

8987 isDoubleClick = true;

9088 }

9189 isClick = true;

@@ -104,7 +102,7 @@ Item {

104102

105103 onReleased: {

106104 if (isDoubleClick || isDrag) {

107− uinput.releaseMouse(UInput.ButtonLeft)

105+ UInput.releaseMouse(UInput.ButtonLeft)

108106 isDoubleClick = false;

109107 }

110108 if (isClick) {

@@ -120,8 +118,8 @@ Item {

120118 interval: 200

121119 property int button: UInput.ButtonLeft

122120 onTriggered: {

123− uinput.pressMouse(button);

124− uinput.releaseMouse(button);

121+ UInput.pressMouse(button);

122+ UInput.releaseMouse(button);

125123 }

126124 function scheduleClick(button) {

127125 clickTimer.button = button;

@@ -138,7 +136,7 @@ Item {

138136 isDrag = true;

139137 }

140138

141− uinput.moveMouse(tp.x - tp.previousX, tp.y - tp.previousY);

139+ UInput.moveMouse(tp.x - tp.previousX, tp.y - tp.previousY);

142140 }

143141

144142 function scroll(touchPoints) {

@@ -166,7 +164,7 @@ Item {

166164 dh /= 2;

167165 dv /= 2;

168166

169− uinput.scrollMouse(dh, dv);

167+ UInput.scrollMouse(dh, dv);

170168 }

171169

172170 touchPoints: [

@@ -189,8 +187,8 @@ Item {

189187 objectName: "leftButton"

190188 Layout.fillWidth: true

191189 Layout.fillHeight: true

192− onPressed: uinput.pressMouse(UInput.ButtonLeft);

193− onReleased: uinput.releaseMouse(UInput.ButtonLeft);

190+ onPressed: UInput.pressMouse(UInput.ButtonLeft);

191+ onReleased: UInput.releaseMouse(UInput.ButtonLeft);

194192 property bool highlight: false

195193 UbuntuShape {

196194 anchors.fill: parent

@@ -204,8 +202,8 @@ Item {

204202 objectName: "rightButton"

205203 Layout.fillWidth: true

206204 Layout.fillHeight: true

207− onPressed: uinput.pressMouse(UInput.ButtonRight);

208− onReleased: uinput.releaseMouse(UInput.ButtonRight);

205+ onPressed: UInput.pressMouse(UInput.ButtonRight);

206+ onReleased: UInput.releaseMouse(UInput.ButtonRight);

209207 property bool highlight: false

210208 UbuntuShape {

211209 anchors.fill: parent

@@ -239,14 +237,10 @@ Item {

239237 }

240238 }

241239

242− Screens {

243− id: screens

244− }

245−

246240 InputMethod {

247241 id: inputMethod

248242 // Don't resize when there is only one screen to avoid resize clashing with the InputMethod in the Shell.

249− enabled: screens.count > 1 && settings.oskEnabled && !tutorial.running

243+ enabled: Screens.count > 1 && settings.oskEnabled && !tutorial.running

250244 objectName: "inputMethod"

251245 anchors.fill: parent

252246 }

qml/DisabledScreenNotice.qml+2−1

@@ -28,8 +28,9 @@ Item {

2828 property var screen: Screen

2929 property var orientationLock: OrientationLock

3030

31+ property alias deviceConfiguration: _deviceConfiguration

3132 DeviceConfiguration {

32− id: deviceConfiguration

33+ id: _deviceConfiguration

3334 name: applicationArguments.deviceName

3435 }

3536

qml/Greeter/Greeter.qml+21−3

@@ -25,6 +25,7 @@ import Unity.Launcher 0.1

2525import Unity.Session 0.1

2626

2727import "." 0.1

28+import ".." 0.1

2829import "../Components"

2930

3031Showable {

@@ -234,7 +235,7 @@ Showable {

234235 if (forcedUnlock && shown) {

235236 hideView();

236237 if (hideNow) {

237− root.hideNow(); // skip hide animation

238+ ShellNotifier.greeter.hide(true); // skip hide animation

238239 }

239240 }

240241 }

@@ -397,7 +398,7 @@ Showable {

397398 onEmergencyCall: root.emergencyCall()

398399 onRequiredChanged: {

399400 if (!loader.item.required) {

400− root.hide();

401+ ShellNotifier.greeter.hide(false);

401402 }

402403 }

403404 }

@@ -529,12 +530,29 @@ Showable {

529530 onRequestAuthenticationUser: d.selectUser(d.getUserIndex(user), true)

530531 }

531532

533+ Connections {

534+ target: ShellNotifier.greeter

535+ onHide: {

536+ if (now) {

537+ root.hideNow(); // skip hide animation

538+ } else {

539+ root.hide();

540+ }

541+ }

542+ }

543+

544+ Binding {

545+ target: ShellNotifier.greeter

546+ property: "shown"

547+ value: root.shown

548+ }

549+

532550 Connections {

533551 target: DBusUnitySessionService

534552 onLockRequested: root.forceShow()

535553 onUnlocked: {

536554 root.forcedUnlock = true;

537− root.hideNow();

555+ ShellNotifier.greeter.hide(true);

538556 }

539557 }

540558

qml/Greeter/SecondaryGreeter.qmlnew file+75

@@ -0,0 +1,75 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+import QtQuick 2.4

18+import Ubuntu.Components 1.3

19+

20+import "../Components"

21+import ".." 0.1

22+

23+Showable {

24+ id: root

25+

26+ readonly property bool active: required || hasLockedApp

27+

28+ readonly property bool hasLockedApp: lockedApp !== ""

29+ readonly property bool locked: false

30+ readonly property bool waiting: false

31+ readonly property bool fullyShown: shown

32+

33+ property string lockedApp: ""

34+

35+ function forceShow() { show(); }

36+ property var notifyAppFocusRequested: (function(appId) { return; })

37+ property var notifyUserRequestedApp: (function(appId) { return; })

38+ property var notifyShowingDashFromDrag: (function(appId) { return false; })

39+

40+ showAnimation: StandardAnimation { property: "opacity"; to: 1 }

41+ hideAnimation: StandardAnimation { property: "opacity"; to: 0 }

42+

43+ shown: ShellNotifier.greeter.shown

44+ Component.onCompleted: opacity = shown ? 1 : 0

45+ visible: opacity != 0

46+

47+ Rectangle {

48+ anchors.fill: parent

49+ color: UbuntuColors.purple

50+ }

51+

52+ MouseArea {

53+ anchors.fill: parent

54+ acceptedButtons: Qt.AllButtons

55+ onWheel: wheel.accepted = true

56+ }

57+

58+ Connections {

59+ target: ShellNotifier.greeter

60+ onHide: {

61+ if (now) {

62+ root.hideNow(); // skip hide animation

63+ } else {

64+ root.hide();

65+ }

66+ }

67+ onShownChanged: {

68+ if (ShellNotifier.greeter.shown) {

69+ root.show();

70+ } else {

71+ root.hide();

72+ }

73+ }

74+ }

75+}

qml/OrientedShell.qml+7−9

@@ -32,15 +32,17 @@ Item {

3232 implicitWidth: units.gu(40)

3333 implicitHeight: units.gu(71)

3434

35+ property alias deviceConfiguration: _deviceConfiguration

36+ property alias orientations: d.orientations

37+ property alias surfaceManager: shell.surfaceManager

38+

3539 onWidthChanged: calculateUsageMode();

3640

3741 DeviceConfiguration {

38− id: deviceConfiguration

42+ id: _deviceConfiguration

3943 name: applicationArguments.deviceName

4044 }

4145

42− property alias orientations: d.orientations

43−

4446 Item {

4547 id: d

4648

@@ -151,10 +153,6 @@ Item {

151153 return false;

152154 }

153155

154− Screens {

155− id: screens

156− }

157−

158156 property int orientation

159157 onPhysicalOrientationChanged: {

160158 if (!orientationLocked) {

@@ -252,7 +250,7 @@ Item {

252250

253251 Shell {

254252 id: shell

255− objectName: "shell"

253+ objectName: "shell-"+screenWindow.objectName

256254 width: root.width

257255 height: root.height

258256 orientation: root.angleToOrientation(orientationAngle)

@@ -265,7 +263,7 @@ Item {

265263 // have multiple keyboards around. For now we only enable one keyboard at a time

266264 // thus hiding it here if there is a physical one around or if we have a second

267265 // screen (the virtual touchpad & osk on the phone) attached.

268− oskEnabled: (keyboardsModel.count === 0 && screens.count === 1) ||

266+ oskEnabled: (keyboardsModel.count === 0 && Screens.count === 1) ||

269267 forceOSKEnabled

270268

271269 usageScenario: {

qml/Panel/Panel.qml+11−10

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

2929 property bool fullscreenMode: false

3030 property real indicatorAreaShowProgress: 1.0

3131 property bool locked: false

32+ property PanelState panelState

3233

3334 MouseArea {

3435 anchors.fill: parent

@@ -40,7 +41,7 @@ Item {

4041 }

4142

4243 Binding {

43− target: PanelState

44+ target: panelState

4445 property: "panelHeight"

4546 value: indicators.minimizedPanelHeight

4647 }

@@ -74,7 +75,7 @@ Item {

7475 fill: indicatorAreaBackground

7576 bottomMargin: -units.gu(1)

7677 }

77− visible: PanelState.dropShadow && !callHint.visible

78+ visible: panelState.dropShadow && !callHint.visible

7879 source: "graphics/rectangular_dropshadow.sci"

7980 }

8081

@@ -120,14 +121,14 @@ Item {

120121 }

121122 height: indicators.minimizedPanelHeight

122123

123− visible: ((PanelState.buttonsVisible && parent.containsMouse) || PanelState.buttonsAlwaysVisible)

124+ visible: ((panelState.buttonsVisible && parent.containsMouse) || panelState.buttonsAlwaysVisible)

124125 && !root.locked && !callHint.visible

125− active: PanelState.buttonsVisible || PanelState.buttonsAlwaysVisible

126+ active: panelState.buttonsVisible || panelState.buttonsAlwaysVisible

126127 windowIsMaximized: true

127− onCloseClicked: PanelState.closeClicked()

128− onMinimizeClicked: PanelState.minimizeClicked()

129− onMaximizeClicked: PanelState.restoreClicked()

130− closeButtonShown: PanelState.closeButtonShown

128+ onCloseClicked: panelState.closeClicked()

129+ onMinimizeClicked: panelState.minimizeClicked()

130+ onMaximizeClicked: panelState.restoreClicked()

131+ closeButtonShown: panelState.closeButtonShown

131132 }

132133 }

133134

@@ -181,8 +182,8 @@ Item {

181182 visible: opacity != 0

182183 verticalAlignment: Text.AlignVCenter

183184 fontSize: "medium"

184− font.weight: PanelState.buttonsVisible ? Font.Light : Font.Medium

185− text: PanelState.title

185+ font.weight: panelState.buttonsVisible ? Font.Light : Font.Medium

186+ text: panelState.title

186187 elide: Text.ElideRight

187188 maximumLineCount: 1

188189 Behavior on opacity { UbuntuNumberAnimation {} }

qml/Shell.qml+25−21

@@ -1,4 +1,4 @@

1−/*

1+/*

33 *

44 * This program is free software; you can redistribute it and/or modify

@@ -38,6 +38,7 @@ import "Notifications"

3838import "Stage"

3939import "Tutorial"

4040import "Wizard"

41+import "Components/PanelState"

4142import Unity.Notifications 1.0 as NotificationBackend

4243import Unity.Session 0.1

4344import Unity.DashCommunicator 0.1

@@ -52,6 +53,7 @@ StyledItem {

5253 theme.name: "Ubuntu.Components.Themes.SuruDark"

5354

5455 // to be set from outside

56+ property alias surfaceManager: topLevelSurfaceList.surfaceManager

5557 property int orientationAngle: 0

5658 property int orientation

5759 property Orientations orientations

@@ -249,7 +251,6 @@ StyledItem {

249251 var mappedCoords = mapFromItem(null, pos.x, pos.y);

250252 cursor.x = mappedCoords.x;

251253 cursor.y = mappedCoords.y;

252− cursor.mouseNeverMoved = false;

253254 }

254255 }

255256

@@ -258,21 +259,21 @@ StyledItem {

258259 schema.id: "com.canonical.Unity8"

259260 }

260261

262+ PanelState {

263+ id: panelState

264+ objectName: "panelState"

265+ }

266+

261267 Item {

262268 id: stages

263269 objectName: "stages"

264270 width: parent.width

265271 height: parent.height

266272

267− SurfaceManager {

268− id: surfaceMan

269− objectName: "surfaceManager"

270− }

271273 TopLevelWindowModel {

272274 id: topLevelSurfaceList

273275 objectName: "topLevelSurfaceList"

274276 applicationManager: ApplicationManager // it's a singleton

275− surfaceManager: surfaceMan

276277 }

277278

278279 Stage {

@@ -313,6 +314,7 @@ StyledItem {

313314 altTabPressed: physicalKeysMapper.altTabPressed

314315 oskEnabled: shell.oskEnabled

315316 spreadEnabled: tutorial.spreadEnabled && (!greeter || (!greeter.hasLockedApp && !greeter.shown))

317+ panelState: panelState

316318 }

317319 }

318320

@@ -333,8 +335,13 @@ StyledItem {

333335 objectName: "greeterLoader"

334336 anchors.fill: parent

335337 anchors.topMargin: panel.panelHeight

336− sourceComponent: shell.mode != "shell" ? integratedGreeter :

337− Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));

338+ sourceComponent: {

339+ if (shell.mode != "shell") {

340+ if (screenWindow.primary) return integratedGreeter;

341+ return secondaryGreeter;

342+ }

343+ return Qt.createComponent(Qt.resolvedUrl("Greeter/ShimGreeter.qml"));

344+ }

338345 onLoaded: {

339346 item.objectName = "greeter"

340347 }

@@ -374,6 +381,13 @@ StyledItem {

374381 }

375382 }

376383

384+ Component {

385+ id: secondaryGreeter

386+ SecondaryGreeter {

387+ hides: [launcher, panel.indicators]

388+ }

389+ }

390+

377391 Timer {

378392 // See powerConnection for why this is useful

379393 id: showGreeterDelayed

@@ -479,6 +493,7 @@ StyledItem {

479493 fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0)

480494 || greeter.hasLockedApp

481495 locked: greeter && greeter.active

496+ panelState: panelState

482497 }

483498

484499 Launcher {

@@ -689,23 +704,13 @@ StyledItem {

689704

690705 Cursor {

691706 id: cursor

692− objectName: "cursor"

693707 visible: shell.hasMouse

694708 z: itemGrabber.z + 1

709+ opacity: 0

695710 topBoundaryOffset: panel.panelHeight

696711

697712 confiningItem: stage.itemConfiningMouseCursor

698713

699− property bool mouseNeverMoved: true

700− Binding {

701− target: cursor; property: "x"; value: shell.width / 2

702− when: cursor.mouseNeverMoved && cursor.visible

703− }

704− Binding {

705− target: cursor; property: "y"; value: shell.height / 2

706− when: cursor.mouseNeverMoved && cursor.visible

707− }

708−

709714 height: units.gu(3)

710715

711716 readonly property var previewRectangle: stage.previewRectangle.target &&

@@ -760,7 +765,6 @@ StyledItem {

760765 }

761766

762767 onMouseMoved: {

763− mouseNeverMoved = false;

764768 cursor.opacity = 1;

765769 }

766770

qml/ShellApplication.qmlnew file+51

@@ -0,0 +1,51 @@

1+/*

3+*

4+* This program is free software; you can redistribute it and/or modify

5+* it under the terms of the GNU General Public License as published by

6+* the Free Software Foundation; version 3.

7+*

8+* This program is distributed in the hope that it will be useful,

9+* but WITHOUT ANY WARRANTY; without even the implied warranty of

10+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+* GNU General Public License for more details.

12+*

13+* You should have received a copy of the GNU General Public License

14+* along with this program. If not, see <http://www.gnu.org/licenses/>.

15+*/

16+

17+import QtQuick 2.4

18+import QtQuick.Window 2.2

19+import Unity.Screens 0.1

20+import Unity.Application 0.1

21+

22+Instantiator {

23+ id: root

24+ model: Screens

25+

26+ property QtObject surfaceMan: SurfaceManager {}

27+

28+ ShellScreen {

29+ id: screen

30+ objectName: "screen"+index

31+ screen: model.screen

32+ visibility: applicationArguments.hasFullscreen ? Window.FullScreen : Window.Windowed

33+ flags: applicationArguments.hasFrameless ? Qt.FramelessWindowHint : 0

34+ surfaceManager: surfaceMan

35+

36+ Binding {

37+ when: applicationArguments.hasGeometry

38+ target: screen

39+ property: "width"

40+ value: applicationArguments.windowGeometry.width

41+ }

42+ Binding {

43+ when: applicationArguments.hasGeometry

44+ target: screen

45+ property: "height"

46+ value: applicationArguments.windowGeometry.height

47+ }

48+

49+ primary: index == 0

50+ }

51+}

src/SecondaryWindow.h → qml/ShellNotifier.qmlrenamed+12−12

@@ -1,5 +1,5 @@

11/*

33 *

44 * This program is free software; you can redistribute it and/or modify

55 * it under the terms of the GNU General Public License as published by

@@ -14,17 +14,17 @@

1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.

1515 */

1616

17−#ifndef UNITY_SECONDARY_WINDOW_H

18−#define UNITY_SECONDARY_WINDOW_H

19−

20−#include <QQuickView>

17+/*

18+ Shared signals & properties on multi-window desktop

19+ */

2120

22−class SecondaryWindow : public QQuickView

23−{

24− Q_OBJECT

21+pragma Singleton

22+import QtQuick 2.4

2523

26−public:

27− SecondaryWindow(QQmlEngine *engine);

28−};

24+QtObject {

25+ property var greeter: QtObject {

26+ signal hide(bool now)

2927

30−#endif // UNITY_SECONDARY_WINDOW_H

28+ property bool shown: true

29+ }

30+}

qml/ShellScreen.qmlnew file+65

@@ -0,0 +1,65 @@

1+/*

3+*

4+* This program is free software; you can redistribute it and/or modify

5+* it under the terms of the GNU General Public License as published by

6+* the Free Software Foundation; version 3.

7+*

8+* This program is distributed in the hope that it will be useful,

9+* but WITHOUT ANY WARRANTY; without even the implied warranty of

10+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+* GNU General Public License for more details.

12+*

13+* You should have received a copy of the GNU General Public License

14+* along with this program. If not, see <http://www.gnu.org/licenses/>.

15+*/

16+

17+import QtQuick 2.4

18+import Ubuntu.Components 1.3

19+import Unity.Screens 0.1

20+import Cursor 1.1

21+import "Components"

22+

23+ScreenWindow {

24+ id: screenWindow

25+

26+ color: "black"

27+ title: "Unity8 Shell"

28+ property bool primary: false

29+ property QtObject surfaceManager: null

30+

31+ DeviceConfiguration {

32+ id: deviceConfiguration

33+ name: applicationArguments.deviceName

34+ }

35+

36+ Loader {

37+ width: screenWindow.width

38+ height: screenWindow.height

39+

40+ sourceComponent: {

41+ if (Screens.count > 1 && primary && deviceConfiguration.category !== "desktop") {

42+ return disabledScreenComponent;

43+ }

44+ return shellComponent;

45+ }

46+ }

47+

48+ Component {

49+ id: shellComponent

50+ OrientedShell {

51+ implicitWidth: screenWindow.width

52+ implicitHeight: screenWindow.height

53+ surfaceManager: screenWindow.surfaceManager

54+

55+ deviceConfiguration {

56+ name: Screens.count > 1 ? "desktop" : applicationArguments.deviceName

57+ }

58+ }

59+ }

60+

61+ Component {

62+ id: disabledScreenComponent

63+ DisabledScreenNotice {}

64+ }

65+}

qml/Stage/DecoratedWindow.qml+4

@@ -18,6 +18,7 @@ import QtQuick 2.4

1818import Ubuntu.Components 1.3

1919import Unity.Application 0.1

2020import "Spread/MathUtils.js" as MathUtils

21+import "../Components/PanelState"

2122

2223FocusScope {

2324 id: root

@@ -70,6 +71,8 @@ FocusScope {

7071

7172 readonly property Item clientAreaItem: applicationWindow

7273

74+ property PanelState panelState

75+

7376 signal closeClicked()

7477 signal maximizeClicked()

7578 signal maximizeHorizontallyClicked()

@@ -179,6 +182,7 @@ FocusScope {

179182 objectName: "moveHandler"

180183 target: root.parent

181184 buttonsWidth: decoration.buttonsWidth

185+ panelState: root.panelState

182186 }

183187

184188 ApplicationWindow {

qml/Stage/FakeMaximizeDelegate.qml+12−11

@@ -35,6 +35,7 @@ Rectangle {

3535 property int leftMargin

3636 property real appContainerWidth

3737 property real appContainerHeight

38+ property PanelState panelState

3839

3940 readonly property real hintThreshold: 0.1

4041

@@ -178,7 +179,7 @@ Rectangle {

178179 ParallelAnimation {

179180 id: fakeMaximizeAnimation

180181 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }

181− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }

182+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }

182183 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: appContainerWidth - leftMargin }

183184 UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight }

184185 }

@@ -186,39 +187,39 @@ Rectangle {

186187 ParallelAnimation {

187188 id: fakeMaximizeLeftAnimation

188189 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }

189− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }

190+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }

190191 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

191− UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - PanelState.panelHeight }

192+ UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - panelState.panelHeight }

192193 }

193194

194195 ParallelAnimation {

195196 id: fakeMaximizeRightAnimation

196197 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }

197− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }

198+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }

198199 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

199− UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - PanelState.panelHeight }

200+ UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight - panelState.panelHeight }

200201 }

201202

202203 ParallelAnimation {

203204 id: fakeMaximizeTopLeftAnimation

204205 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }

205− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }

206+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }

206207 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

207− UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - PanelState.panelHeight)/2 }

208+ UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - panelState.panelHeight)/2 }

208209 }

209210

210211 ParallelAnimation {

211212 id: fakeMaximizeTopRightAnimation

212213 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }

213− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: PanelState.panelHeight }

214+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: panelState.panelHeight }

214215 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

215− UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - PanelState.panelHeight)/2 }

216+ UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight - panelState.panelHeight)/2 }

216217 }

217218

218219 ParallelAnimation {

219220 id: fakeMaximizeBottomLeftAnimation

220221 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: leftMargin }

221− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + PanelState.panelHeight)/2 }

222+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + panelState.panelHeight)/2 }

222223 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

223224 UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight/2 }

224225 }

@@ -226,7 +227,7 @@ Rectangle {

226227 ParallelAnimation {

227228 id: fakeMaximizeBottomRightAnimation

228229 UbuntuNumberAnimation { target: fakeRectangle; properties: "x"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth + leftMargin)/2 }

229− UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + PanelState.panelHeight)/2 }

230+ UbuntuNumberAnimation { target: fakeRectangle; properties: "y"; duration: UbuntuAnimation.BriskDuration; to: (appContainerHeight + panelState.panelHeight)/2 }

230231 UbuntuNumberAnimation { target: fakeRectangle; properties: "width"; duration: UbuntuAnimation.BriskDuration; to: (appContainerWidth - leftMargin)/2 }

231232 UbuntuNumberAnimation { target: fakeRectangle; properties: "height"; duration: UbuntuAnimation.BriskDuration; to: appContainerHeight/2 }

232233 }

qml/Stage/MoveHandler.qml+8−7

@@ -28,6 +28,7 @@ QtObject {

2828 property int stageWidth

2929 property int stageHeight

3030 property real buttonsWidth: 0

31+ property PanelState panelState

3132

3233 readonly property bool dragging: priv.dragging

3334

@@ -122,18 +123,18 @@ QtObject {

122123 // position. Mouse movement could have subpixel precision, yielding a fractional

123124 // mouse position.

124125 target.windowedX = Math.round(pos.x - priv.distanceX);

125− target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, PanelState.panelHeight));

126+ target.windowedY = Math.round(Math.max(pos.y - priv.distanceY, panelState.panelHeight));

126127

127128 if (sensingPoints) { // edge/corner detection when dragging via the touch overlay

128− if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < PanelState.panelHeight + priv.triggerArea

129+ if (sensingPoints.topLeft.x < priv.triggerArea && sensingPoints.topLeft.y < panelState.panelHeight + priv.triggerArea

129130 && target.canBeCornerMaximized) { // top left

130− priv.progress = priv.progressInCorner(0, PanelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);

131+ priv.progress = priv.progressInCorner(0, panelState.panelHeight, sensingPoints.topLeft.x, sensingPoints.topLeft.y);

131132 priv.resetEdges();

132133 priv.nearTopLeftCorner = true;

133134 root.fakeMaximizeTopLeftAnimationRequested(priv.progress);

134− } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < PanelState.panelHeight + priv.triggerArea

135+ } else if (sensingPoints.topRight.x > stageWidth - priv.triggerArea && sensingPoints.topRight.y < panelState.panelHeight + priv.triggerArea

135136 && target.canBeCornerMaximized) { // top right

136− priv.progress = priv.progressInCorner(stageWidth, PanelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);

137+ priv.progress = priv.progressInCorner(stageWidth, panelState.panelHeight, sensingPoints.topRight.x, sensingPoints.topRight.y);

137138 priv.resetEdges();

138139 priv.nearTopRightCorner = true;

139140 root.fakeMaximizeTopRightAnimationRequested(priv.progress);

@@ -159,8 +160,8 @@ QtObject {

159160 priv.resetEdges();

160161 priv.nearRightEdge = true;

161162 root.fakeMaximizeRightAnimationRequested(priv.progress);

162− } else if (sensingPoints.top.y < PanelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top

163− priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, PanelState.panelHeight + priv.triggerArea, 0, 0, 1);

163+ } else if (sensingPoints.top.y < panelState.panelHeight + priv.triggerArea && target.canBeMaximized) { // top

164+ priv.progress = MathUtils.clampAndProject(sensingPoints.top.y, panelState.panelHeight + priv.triggerArea, 0, 0, 1);

164165 priv.resetEdges();

165166 priv.nearTopEdge = true;

166167 root.fakeMaximizeAnimationRequested(priv.progress);

qml/Stage/Spread/ScreensAndWorkspaces.qmlnew file+27

@@ -0,0 +1,27 @@

1+import QtQuick 2.4

2+import Ubuntu.Components 1.3

3+import Unity.Screens 0.1

4+import Unity.Application 0.1

5+import ".."

6+

7+Item {

8+ id: root

9+

10+

11+ Rectangle { anchors.fill: parent; color: "blue"; opacity: .3 }

12+

13+ Row {

14+ anchors.bottom: parent.bottom

15+ anchors.bottomMargin: units.gu(1)

16+ anchors.horizontalCenter: parent.horizontalCenter

17+ spacing: units.gu(1)

18+

19+ Repeater {

20+ model: Screens

21+

22+ delegate: WorkspacePreview {

23+ height: root.height - units.gu(6)

24+ }

25+ }

26+ }

27+}

qml/Stage/Spread/Spread.qml+5−5

@@ -28,10 +28,10 @@ Item {

2828 property var spreadFlickable

2929

3030 // some config options

31− property real contentMargin: 0.16 * root.height

32− property real contentTopMargin: contentMargin

33− property real contentBottomMargin: 0.35 * contentMargin

34− property real windowTitleTopMargin: 3/4 * (contentTopMargin - windowTitle.height)

31+ property real contentMargin: 0.1 * root.height

32+ property real contentTopMargin: contentMargin + root.y + windowTitle.height

33+ property real contentBottomMargin: contentMargin

34+ property real windowTitleTopMargin: contentMargin - windowTitle.height

3535 property int stackItemCount: 3

3636 property real leftRotationAngle: 22

3737 property real rightRotationAngle: 32

@@ -51,7 +51,7 @@ Item {

5151

5252 readonly property real spreadWidth: rightStackXPos - leftStackXPos

5353 readonly property real spreadHeight: root.height

54− readonly property real spreadItemHeight: spreadHeight - contentTopMargin - contentBottomMargin

54+ readonly property real spreadItemHeight: spreadHeight - contentMargin * 2

5555 readonly property real spreadItemWidth: stackHeight

5656

5757 readonly property real dynamicLeftRotationAngle: leftRotationAngle * rotationAngleFactor

qml/Stage/Stage.qml+36−26

@@ -46,6 +46,7 @@ FocusScope {

4646 property int leftMargin: 0

4747 property bool oskEnabled: false

4848 property rect inputMethodRect

49+ property PanelState panelState

4950

5051 // Configuration

5152 property string mode: "staged"

@@ -348,20 +349,20 @@ FocusScope {

348349 Component.onCompleted: priv.updateMainAndSideStageIndexes();

349350

350351 Connections {

351− target: PanelState

352+ target: panelState

352353 onCloseClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.close(); } }

353354 onMinimizeClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestMinimize(); } }

354355 onRestoreClicked: { if (priv.focusedAppDelegate) { priv.focusedAppDelegate.requestRestore(); } }

355356 }

356357

357358 Binding {

358− target: PanelState

359+ target: panelState

359360 property: "buttonsVisible"

360361 value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.maximized // FIXME for Locally integrated menus

361362 }

362363

363364 Binding {

364− target: PanelState

365+ target: panelState

365366 property: "title"

366367 value: {

367368 if (priv.focusedAppDelegate !== null) {

@@ -376,21 +377,21 @@ FocusScope {

376377 }

377378

378379 Binding {

379− target: PanelState

380+ target: panelState

380381 property: "dropShadow"

381382 value: priv.focusedAppDelegate && !priv.focusedAppDelegate.maximized && priv.foregroundMaximizedAppDelegate !== null && mode == "windowed"

382383 }

383384

384385 Binding {

385− target: PanelState

386+ target: panelState

386387 property: "closeButtonShown"

387388 value: priv.focusedAppDelegate && priv.focusedAppDelegate.maximized && !priv.focusedAppDelegate.isDash

388389 }

389390

390391 Component.onDestruction: {

391− PanelState.title = "";

392− PanelState.buttonsVisible = false;

393− PanelState.dropShadow = false;

392+ panelState.title = "";

393+ panelState.buttonsVisible = false;

394+ panelState.dropShadow = false;

394395 }

395396

396397 Instantiator {

@@ -468,7 +469,7 @@ FocusScope {

468469 },

469470 State {

470471 name: "staged"; when: root.mode === "staged"

471− PropertyChanges { target: wallpaper; visible: false }

472+ PropertyChanges { target: wallpaper; visible: priv.focusedAppDelegate && priv.focusedAppDelegate.x === 0 }

472473 },

473474 State {

474475 name: "stagedWithSideStage"; when: root.mode === "stagedWithSideStage"

@@ -545,10 +546,16 @@ FocusScope {

545546 visible: false

546547 }

547548

549+ ScreensAndWorkspaces {

550+ id: screensAndWorkspaces

551+ anchors { left: parent.left; top: parent.top; right: parent.right }

552+ height: parent.height / 3

553+ }

554+

548555 Spread {

549556 id: spreadItem

550557 objectName: "spreadItem"

551− anchors.fill: appContainer

558+ anchors { left: parent.left; bottom: parent.bottom; right: parent.right; top: screensAndWorkspaces.bottom }

552559 leftMargin: root.leftMargin

553560 model: root.topLevelSurfaceList

554561 spreadFlickable: floatingFlickable

@@ -739,7 +746,7 @@ FocusScope {

739746 target: appDelegate

740747 property: "y"

741748 value: appDelegate.requestedY -

742− Math.min(appDelegate.requestedY - PanelState.panelHeight,

749+ Math.min(appDelegate.requestedY - panelState.panelHeight,

743750 Math.max(0, priv.virtualKeyboardHeight - (appContainer.height - (appDelegate.requestedY + appDelegate.height))))

744751 when: root.oskEnabled && appDelegate.focus && (appDelegate.state == "normal" || appDelegate.state == "restored")

745752 && root.inputMethodRect.height > 0

@@ -876,7 +883,7 @@ FocusScope {

876883 screenWidth: appContainer.width

877884 screenHeight: appContainer.height

878885 leftMargin: root.leftMargin

879− minimumY: PanelState.panelHeight

886+ minimumY: panelState.panelHeight

880887 }

881888

882889 Connections {

@@ -1116,7 +1123,7 @@ FocusScope {

11161123 progress: 0

11171124 targetHeight: spreadItem.stackHeight

11181125 targetX: spreadMaths.targetX

1119− startY: appDelegate.fullscreen ? 0 : PanelState.panelHeight

1126+ startY: appDelegate.fullscreen ? 0 : panelState.panelHeight

11201127 targetY: spreadMaths.targetY

11211128 targetAngle: spreadMaths.targetAngle

11221129 targetScale: spreadMaths.targetScale

@@ -1235,9 +1242,9 @@ FocusScope {

12351242 PropertyChanges {

12361243 target: appDelegate

12371244 x: stageMaths.itemX

1238− y: appDelegate.fullscreen ? 0 : PanelState.panelHeight

1245+ y: appDelegate.fullscreen ? 0 : panelState.panelHeight

12391246 requestedWidth: appContainer.width

1240− requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight

1247+ requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - panelState.panelHeight

12411248 visuallyMaximized: true

12421249 visible: appDelegate.x < root.width

12431250 }

@@ -1263,10 +1270,10 @@ FocusScope {

12631270 PropertyChanges {

12641271 target: appDelegate

12651272 x: stageMaths.itemX

1266− y: appDelegate.fullscreen ? 0 : PanelState.panelHeight

1273+ y: appDelegate.fullscreen ? 0 : panelState.panelHeight

12671274 z: stageMaths.itemZ

12681275 requestedWidth: stageMaths.itemWidth

1269− requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - PanelState.panelHeight

1276+ requestedHeight: appDelegate.fullscreen ? appContainer.height : appContainer.height - panelState.panelHeight

12701277 visuallyMaximized: true

12711278 visible: appDelegate.x < root.width

12721279 }

@@ -1331,9 +1338,9 @@ FocusScope {

13311338 PropertyChanges {

13321339 target: appDelegate

13331340 windowedX: root.leftMargin

1334− windowedY: PanelState.panelHeight

1341+ windowedY: panelState.panelHeight

13351342 windowedWidth: (appContainer.width - root.leftMargin)/2

1336− windowedHeight: appContainer.height - PanelState.panelHeight

1343+ windowedHeight: appContainer.height - panelState.panelHeight

13371344 }

13381345 },

13391346 State {

@@ -1350,9 +1357,9 @@ FocusScope {

13501357 PropertyChanges {

13511358 target: appDelegate

13521359 windowedX: root.leftMargin

1353− windowedY: PanelState.panelHeight

1360+ windowedY: panelState.panelHeight

13541361 windowedWidth: (appContainer.width - root.leftMargin)/2

1355− windowedHeight: (appContainer.height - PanelState.panelHeight)/2

1362+ windowedHeight: (appContainer.height - panelState.panelHeight)/2

13561363 }

13571364 },

13581365 State {

@@ -1369,7 +1376,7 @@ FocusScope {

13691376 PropertyChanges {

13701377 target: appDelegate

13711378 windowedX: root.leftMargin

1372− windowedY: (appContainer.height + PanelState.panelHeight)/2

1379+ windowedY: (appContainer.height + panelState.panelHeight)/2

13731380 windowedWidth: (appContainer.width - root.leftMargin)/2

13741381 windowedHeight: appContainer.height/2

13751382 }

@@ -1391,8 +1398,8 @@ FocusScope {

13911398 State {

13921399 name: "maximizedVertically"; when: appDelegate.maximizedVertically && !appDelegate.minimized

13931400 extend: "normal"

1394− PropertyChanges { target: appDelegate; windowedX: windowedX; windowedY: PanelState.panelHeight;

1395− windowedWidth: windowedWidth; windowedHeight: appContainer.height - PanelState.panelHeight }

1401+ PropertyChanges { target: appDelegate; windowedX: windowedX; windowedY: panelState.panelHeight;

1402+ windowedWidth: windowedWidth; windowedHeight: appContainer.height - panelState.panelHeight }

13961403 },

13971404 State {

13981405 name: "minimized"; when: appDelegate.minimized

@@ -1491,7 +1498,7 @@ FocusScope {

14911498 ]

14921499

14931500 Binding {

1494− target: PanelState

1501+ target: panelState

14951502 property: "buttonsAlwaysVisible"

14961503 value: appDelegate && appDelegate.maximized && touchControls.overlayShown

14971504 }

@@ -1506,7 +1513,7 @@ FocusScope {

15061513 anchors.margins: touchControls.overlayShown ? borderThickness/2 : -borderThickness

15071514

15081515 target: appDelegate

1509− minimumY: PanelState.panelHeight // disallow resizing up past Panel

1516+ minimumY: panelState.panelHeight // disallow resizing up past Panel

15101517 minWidth: units.gu(10)

15111518 minHeight: units.gu(10)

15121519 borderThickness: units.gu(2)

@@ -1536,6 +1543,7 @@ FocusScope {

15361543 highlightSize: windowInfoItem.iconMargin / 2

15371544 stageWidth: appContainer.width

15381545 stageHeight: appContainer.height

1546+ panelState: root.panelState

15391547

15401548 requestedWidth: appDelegate.requestedWidth

15411549 requestedHeight: appDelegate.requestedHeight

@@ -1595,6 +1603,7 @@ FocusScope {

15951603 visible: enabled

15961604 stageWidth: appContainer.width

15971605 stageHeight: appContainer.height

1606+ panelState: root.panelState

15981607

15991608 onFakeMaximizeAnimationRequested: if (!appDelegate.maximized) fakeRectangle.maximize(amount, true)

16001609 onFakeMaximizeLeftAnimationRequested: if (!appDelegate.maximizedLeft) fakeRectangle.maximizeLeft(amount, true)

@@ -1699,6 +1708,7 @@ FocusScope {

16991708 leftMargin: root.leftMargin

17001709 appContainerWidth: appContainer.width

17011710 appContainerHeight: appContainer.height

1711+ panelState: root.panelState

17021712 }

17031713

17041714 EdgeBarrier {

qml/Stage/SurfaceContainer.qml+2

@@ -66,6 +66,8 @@ FocusScope {

6666 fillMode: MirSurfaceItem.PadOrCrop

6767 consumesInput: true

6868

69+ onSurfaceChanged: print("surface changed", surface, implicitWidth, implicitHeight)

70+

6971 surfaceWidth: root.requestedWidth

7072 surfaceHeight: root.requestedHeight

7173

qml/Stage/WindowControlsOverlay.qml+2

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

2727

2828 // to be set from outside

2929 property Item target // appDelegate

30+ property PanelState panelState

3031 property alias stageWidth: moveHandler.stageWidth

3132 property alias stageHeight: moveHandler.stageHeight

3233

@@ -161,6 +162,7 @@ Item {

161162 id: moveHandler

162163 objectName: "moveHandler"

163164 target: root.target

165+ panelState: root.panelState

164166

165167 onFakeMaximizeAnimationRequested: root.fakeMaximizeAnimationRequested(amount)

166168 onFakeMaximizeLeftAnimationRequested: root.fakeMaximizeLeftAnimationRequested(amount)

qml/Stage/WorkspacePreview.qmlnew file+50

@@ -0,0 +1,50 @@

1+import QtQuick 2.4

2+import Ubuntu.Components 1.3

3+import Unity.Application 0.1

4+

5+UbuntuShape {

6+ id: previewSpace

7+

8+ // Set the height. this preview will then automatically adjust the width, keeping aspect ratio of the screen

9+ width: model.geometry.width * previewScale

10+ color: "white"

11+

12+ property int screenWidth: model.geometry.width

13+ property int screenHeight: model.geometry.height

14+ property real previewScale: previewSpace.height / previewSpace.screenHeight

15+

16+ Label {

17+ text: model.name + "," + model.geometry.width

18+ color: "black"

19+ }

20+

21+ Rectangle {

22+ anchors.fill: parent

23+ anchors.topMargin: units.gu(4)

24+

25+ Repeater {

26+ id: topLevelSurfaceRepeater

27+ model: topLevelSurfaceList

28+ delegate: Rectangle {

29+ width: surfaceItem.width

30+ height: surfaceItem.height

31+ x: model.window.position.x * previewSpace.previewScale

32+ y: model.window.position.y * previewSpace.previewScale

33+ color: "blue"

34+ z: topLevelSurfaceRepeater.count - index

35+

36+

37+ MirSurfaceItem {

38+ id: surfaceItem

39+

40+ width: implicitWidth * previewScale

41+ height: implicitHeight * previewScale

42+ surfaceWidth: -1

43+ surfaceHeight: -1

44+ onImplicitHeightChanged: print("item", surfaceItem, "height changed", implicitHeight)

45+ surface: model.window.surface

46+ }

47+ }

48+ }

49+ }

50+}

qml/qmldirnew file+1

@@ -0,0 +1 @@

1+singleton ShellNotifier 0.1 ShellNotifier.qml

src/ApplicationArguments.cpp+11−2

@@ -16,7 +16,16 @@

1616

1717#include "ApplicationArguments.h"

1818

19−ApplicationArguments::ApplicationArguments(QObject *parent)

20− : QObject(parent)

19+ApplicationArguments::ApplicationArguments(QCoreApplication *app)

20+ : QObject(app)

21+ , UnityCommandLineParser(*app)

2122{

2223}

24+

25+void ApplicationArguments::setDeviceName(const QString &deviceName)

26+{

27+ if (deviceName != m_deviceName) {

28+ m_deviceName = deviceName;

29+ Q_EMIT deviceNameChanged(m_deviceName);

30+ }

31+}

src/ApplicationArguments.h+16−15

@@ -23,31 +23,32 @@

2323#include <QSize>

2424#include <QString>

2525

26−class ApplicationArguments : public QObject

26+#include "UnityCommandLineParser.h"

27+

28+class ApplicationArguments : public QObject,

29+ public UnityCommandLineParser

2730{

2831 Q_OBJECT

2932 Q_PROPERTY(QString deviceName READ deviceName NOTIFY deviceNameChanged)

3033 Q_PROPERTY(QString mode READ mode CONSTANT)

34+

35+ Q_PROPERTY(bool hasGeometry READ hasGeometry CONSTANT)

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+#ifdef UNITY8_ENABLE_TOUCH_EMULATION

40+ Q_PROPERTY(bool hasMouseToTouch READ hasMouseToTouch CONSTANT)

41+#endif

42+

3143public:

32− ApplicationArguments(QObject *parent = nullptr);

44+ ApplicationArguments(QCoreApplication *app);

3345

34− void setDeviceName(const QString &deviceName) {

35− if (deviceName != m_deviceName) {

36− m_deviceName = deviceName;

37− Q_EMIT deviceNameChanged(m_deviceName);

38− }

39− }

40− QString deviceName() const { return m_deviceName; }

46+ void setDeviceName(const QString &deviceName);

4147

42− void setMode(const QString &mode) { m_mode = mode; }

43− QString mode() const { return m_mode; }

48+ bool hasGeometry() const { return m_windowGeometry.isValid(); }

4449

4550Q_SIGNALS:

4651 void deviceNameChanged(const QString&);

47−

48−private:

49− QString m_deviceName;

50− QString m_mode;

5152};

5253

5354#endif // APPLICATION_ARGUMENTS_H

src/CMakeLists.txt−2

@@ -20,9 +20,7 @@ set(SOURCE_FILES

2020 ApplicationArguments.cpp

2121 main.cpp

2222 CachingNetworkManagerFactory.cpp

23− SecondaryWindow.cpp

2423 ShellApplication.cpp

25− ShellView.cpp

2624 UnityCommandLineParser.cpp

2725 UnixSignalHandler.cpp

2826 ${QML_FILES} # This is to make qml and image files appear in the IDE's project tree

src/SecondaryWindow.cppdeleted−40

@@ -1,40 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "SecondaryWindow.h"

18−

19−// local

20−#include <paths.h>

21−

22−#include <QQmlContext>

23−

24−SecondaryWindow::SecondaryWindow(QQmlEngine *engine)

25− : QQuickView(engine, nullptr)

26−{

27− QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");

28− bool ok;

29− int pxpgu = pxpguEnv.toInt(&ok);

30− if (!ok) {

31− pxpgu = 8;

32− }

33− engine->rootContext()->setContextProperty(QStringLiteral("internalGu"), pxpgu);

34− setResizeMode(QQuickView::SizeRootObjectToView);

35− setColor("black");

36− setTitle(QStringLiteral("Unity8 Shell - Secondary Screen"));

37−

38− QUrl source(::qmlDirectory() + "/DisabledScreenNotice.qml");

39− setSource(source);

40−}

src/ShellApplication.cpp+29−107

@@ -20,6 +20,7 @@

2020#include <QLibrary>

2121#include <QProcess>

2222#include <QScreen>

23+#include <QQmlContext>

2324

2425#include <libintl.h>

2526

@@ -33,31 +34,23 @@

3334

3435ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

3536 : QGuiApplication(argc, argv)

37+ , m_qmlArgs(this)

3638{

3739

3840 setApplicationName(QStringLiteral("unity8"));

3941 setOrganizationName(QStringLiteral("Canonical"));

4042

41− connect(this, &QGuiApplication::screenAdded, this, &ShellApplication::onScreenAdded);

42−

4343 setupQmlEngine(isMirServer);

4444

45− UnityCommandLineParser parser(*this);

46−

47− if (!parser.deviceName().isEmpty()) {

48− m_deviceName = parser.deviceName();

49− } else {

45+ if (m_qmlArgs.deviceName().isEmpty()) {

5046 char buffer[200];

5147 property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);

52− m_deviceName = QString(buffer);

48+ m_qmlArgs.setDeviceName(QString(buffer));

5349 }

54− m_qmlArgs.setDeviceName(m_deviceName);

55−

56− m_qmlArgs.setMode(parser.mode());

5750

5851 // The testability driver is only loaded by QApplication but not by QGuiApplication.

5952 // However, QApplication depends on QWidget which would add some unneeded overhead => Let's load the testability driver on our own.

60− if (parser.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {

53+ if (m_qmlArgs.hasTestability() || getenv("QT_LOAD_TESTABILITY")) {

6154 QLibrary testLib(QStringLiteral("qttestability"));

6255 if (testLib.load()) {

6356 typedef void (*TasInitialize)(void);

@@ -75,57 +68,39 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)

7568 bindtextdomain("unity8", translationDirectory().toUtf8().data());

7669 textdomain("unity8");

7770

78− m_shellView = new ShellView(m_qmlEngine, &m_qmlArgs);

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

7972

80− if (parser.windowGeometry().isValid()) {

81− m_shellView->setWidth(parser.windowGeometry().width());

82− m_shellView->setHeight(parser.windowGeometry().height());

73+ QByteArray pxpguEnv = qgetenv("GRID_UNIT_PX");

74+ bool ok;

75+ int pxpgu = pxpguEnv.toInt(&ok);

76+ if (!ok) {

77+ pxpgu = 8;

8378 }

84−

85− if (parser.hasFrameless()) {

86− m_shellView->setFlags(Qt::FramelessWindowHint);

87− }

88−

79+ m_qmlEngine->rootContext()->setContextProperty("internalGu", pxpgu);

80+ m_qmlEngine->load(::qmlDirectory() + "/ShellApplication.qml");

8981

9082 #ifdef UNITY8_ENABLE_TOUCH_EMULATION

9183 // You will need this if you want to interact with touch-only components using a mouse

9284 // Needed only when manually testing on a desktop.

93− if (parser.hasMouseToTouch()) {

85+ if (m_qmlArgs.hasMouseToTouch()) {

9486 m_mouseTouchAdaptor = MouseTouchAdaptor::instance();

9587 }

9688 #endif

9789

98−

99− // Some hard-coded policy for now.

100− // NB: We don't support more than two screens at the moment

101− //

102− // TODO: Support an arbitrary number of screens and different policies

103− // (eg cloned desktop, several desktops, etc)

104− if (isMirServer && screens().count() == 2) {

105− m_shellView->setScreen(screens().at(1));

106− m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

107−

108− m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

109− m_secondaryWindow->setScreen(screens().at(0));

110− // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!

111− m_secondaryWindow->setWindowState(Qt::WindowFullScreen);

112− m_secondaryWindow->setVisible(true);

113− }

114−

115− if (parser.mode().compare("greeter") == 0) {

116− QSize primaryScreenSize = this->primaryScreen()->size();

117− m_shellView->setHeight(primaryScreenSize.height());

118− m_shellView->setWidth(primaryScreenSize.width());

119− m_shellView->show();

120− m_shellView->requestActivate();

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

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

123− }

124− } else if (isMirServer || parser.hasFullscreen()) {

125− m_shellView->showFullScreen();

126− } else {

127− m_shellView->show();

128− }

90+// if (parser.mode().compare("greeter") == 0) {

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

92+// m_shellView->setHeight(primaryScreenSize.height());

93+// m_shellView->setWidth(primaryScreenSize.width());

94+// m_shellView->show();

95+// m_shellView->requestActivate();

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

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

98+// }

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

100+// m_shellView->showFullScreen();

101+// } else {

102+// m_shellView->show();

103+// }

129104}

130105

131106ShellApplication::~ShellApplication()

@@ -135,14 +110,6 @@ ShellApplication::~ShellApplication()

135110

136111void ShellApplication::destroyResources()

137112{

138− // Deletion order is important. Don't use QScopedPointers and the like

139− // Otherwise the process will hang on shutdown (bug somewhere I guess).

140− delete m_shellView;

141− m_shellView = nullptr;

142−

143− delete m_secondaryWindow;

144− m_secondaryWindow = nullptr;

145−

146113 #ifdef UNITY8_ENABLE_TOUCH_EMULATION

147114 delete m_mouseTouchAdaptor;

148115 m_mouseTouchAdaptor = nullptr;

@@ -154,7 +121,7 @@ void ShellApplication::destroyResources()

154121

155122void ShellApplication::setupQmlEngine(bool isMirServer)

156123{

157− m_qmlEngine = new QQmlEngine(this);

124+ m_qmlEngine = new QQmlApplicationEngine(this);

158125

159126 m_qmlEngine->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

160127

@@ -168,48 +135,3 @@ void ShellApplication::setupQmlEngine(bool isMirServer)

168135

169136 QObject::connect(m_qmlEngine, &QQmlEngine::quit, this, &QGuiApplication::quit);

170137}

171−

172−void ShellApplication::onScreenAdded(QScreen * /*screen*/)

173−{

174− // TODO: Support an arbitrary number of screens and different policies

175− // (eg cloned desktop, several desktops, etc)

176− if (screens().count() == 2) {

177− m_shellView->setScreen(screens().at(1));

178− m_qmlArgs.setDeviceName(QStringLiteral("desktop"));

179− // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

180− // its backing QPlatformWindow recreated). So lets refocus it.

181− m_shellView->requestActivate();

182− // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again

183− // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/

184− m_shellView->setVisible(true);

185−

186− m_secondaryWindow = new SecondaryWindow(m_qmlEngine);

187− m_secondaryWindow->setScreen(screens().at(0));

188−

189− // QWindow::showFullScreen() also calls QWindow::requestActivate() and we don't want that!

190− m_secondaryWindow->setWindowState(Qt::WindowFullScreen);

191− m_secondaryWindow->setVisible(true);

192− }

193−}

194−

195−void ShellApplication::onScreenAboutToBeRemoved(QScreen *screen)

196−{

197− // TODO: Support an arbitrary number of screens and different policies

198− // (eg cloned desktop, several desktops, etc)

199− if (screen == m_shellView->screen()) {

200− const QList<QScreen *> allScreens = screens();

201− Q_ASSERT(allScreens.count() > 1);

202− Q_ASSERT(allScreens.at(0) != screen);

203− Q_ASSERT(m_secondaryWindow);

204− delete m_secondaryWindow;

205− m_secondaryWindow = nullptr;

206− m_shellView->setScreen(allScreens.first());

207− m_qmlArgs.setDeviceName(m_deviceName);

208− // Changing the QScreen where a QWindow is drawn makes it also lose focus (besides having

209− // its backing QPlatformWindow recreated). So lets refocus it.

210− m_shellView->requestActivate();

211− // QWindow::destroy() is called when it changes between screens. We have to manually make it visible again

212− // <dandrader> This bug is supposedly fixed in Qt 5.5.1, although I can still reproduce it there. :-/

213− m_shellView->setVisible(true);

214− }

215−}

src/ShellApplication.h+2−14

@@ -18,7 +18,7 @@

1818#define SHELLAPPLICATION_H

1919

2020#include <QGuiApplication>

21−#include <QQmlEngine>

21+#include <QQmlApplicationEngine>

2222#include <QQuickView>

2323#include <QScopedPointer>

2424

@@ -28,9 +28,6 @@

2828#include "MouseTouchAdaptor.h"

2929#endif

3030

31−#include "SecondaryWindow.h"

32−#include "ShellView.h"

33−

3431class ShellApplication : public QGuiApplication

3532{

3633 Q_OBJECT

@@ -39,25 +36,16 @@ public:

3936 virtual ~ShellApplication();

4037

4138 void destroyResources();

42−public Q_SLOTS:

43− // called by qtmir

44− void onScreenAboutToBeRemoved(QScreen *screen);

45−

46−private Q_SLOTS:

47− void onScreenAdded(QScreen*);

4839

4940private:

5041 void setupQmlEngine(bool isMirServer);

51− QString m_deviceName;

5242 ApplicationArguments m_qmlArgs;

53− ShellView *m_shellView{nullptr};

54− SecondaryWindow *m_secondaryWindow{nullptr};

5543

5644 #ifdef UNITY8_ENABLE_TOUCH_EMULATION

5745 MouseTouchAdaptor *m_mouseTouchAdaptor{nullptr};

5846 #endif

5947

60− QQmlEngine *m_qmlEngine{nullptr};

48+ QQmlApplicationEngine *m_qmlEngine{nullptr};

6149};

6250

6351#endif // SHELLAPPLICATION_H

src/ShellView.cppdeleted−63

@@ -1,63 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#include "ShellView.h"

18−

19−// Qt

20−#include <QQmlContext>

21−#include <QQuickItem>

22−

23−// local

24−#include <paths.h>

25−

26−ShellView::ShellView(QQmlEngine *engine, QObject *qmlArgs)

27− : QQuickView(engine, nullptr)

28−{

29− setResizeMode(QQuickView::SizeRootObjectToView);

30− setColor("black");

31− setTitle(QStringLiteral("Unity8"));

32−

33− rootContext()->setContextProperty(QStringLiteral("applicationArguments"), qmlArgs);

34−

35− QUrl source(::qmlDirectory() + "/OrientedShell.qml");

36− setSource(source);

37−

38− connect(this, &QWindow::widthChanged, this, &ShellView::onWidthChanged);

39− connect(this, &QWindow::heightChanged, this, &ShellView::onHeightChanged);

40−}

41−

42−void ShellView::onWidthChanged(int w)

43−{

44− // For good measure in case SizeRootObjectToView doesn't fulfill its promise.

45− //

46− // There's at least one situation that's know to leave the root object with an outdated size.

47− // (really looks like Qt bug)

48− // Happens when starting unity8 with an external monitor already connected.

49− // The QResizeEvent we get still has the size of the first screen and since the resize move is triggered

50− // from the resize event handler, the root item doesn't get resized.

51− // TODO: Confirm the Qt bug and submit a patch upstream

52− if (rootObject()) {

53− rootObject()->setWidth(w);

54− }

55−}

56−

57−void ShellView::onHeightChanged(int h)

58−{

59− // See comment in ShellView::onWidthChanged()

60− if (rootObject()) {

61− rootObject()->setHeight(h);

62− }

63−}

src/ShellView.hdeleted−34

@@ -1,34 +0,0 @@

1−/*

3− *

4− * This program is free software; you can redistribute it and/or modify

5− * it under the terms of the GNU General Public License as published by

6− * the Free Software Foundation; version 3.

7− *

8− * This program is distributed in the hope that it will be useful,

9− * but WITHOUT ANY WARRANTY; without even the implied warranty of

10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11− * GNU General Public License for more details.

12− *

13− * You should have received a copy of the GNU General Public License

14− * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− */

16−

17−#ifndef UNITY_SHELL_VIEW_H

18−#define UNITY_SHELL_VIEW_H

19−

20−#include <QQuickView>

21−

22−class ShellView : public QQuickView

23−{

24− Q_OBJECT

25−

26−public:

27− ShellView(QQmlEngine *engine, QObject *qmlArgs);

28−

29−private Q_SLOTS:

30− void onWidthChanged(int);

31− void onHeightChanged(int);

32−};

33−

34−#endif // UNITY_SHELL_VIEW_H

src/UnityCommandLineParser.h+1−1

@@ -36,8 +36,8 @@ public:

3636 bool hasFullscreen() const { return m_hasFullscreen; }

3737 QString deviceName() const { return m_deviceName; }

3838 QString mode() const { return m_mode; }

39−private:

4039

40+protected:

4141 int parsePixelsValue(const QString &str);

4242 static float getenvFloat(const char* name, float defaultValue);

4343 void resolveMode(QCommandLineParser &parser, QCommandLineOption &modeOption);

tests/mocks/Cursor/Cursor.qml+50−2

@@ -15,8 +15,11 @@

1515 */

1616

1717import QtQuick 2.4

18+import UInput 0.1

19+

20+Canvas {

21+ id: root

1822

19−Item {

2023 property int topBoundaryOffset // effectively panel height

2124 property Item confiningItem

2225

@@ -30,5 +33,50 @@ Item {

3033 signal pushStopped()

3134 signal mouseMoved()

3235

33− onMouseMoved: opacity = 1;

36+ width: units.gu(2)

37+ height: units.gu(2)

38+ antialiasing: true

39+

40+ onPaint: {

41+ var ctx = getContext("2d");

42+ ctx.save();

43+ ctx.clearRect(0,0,width, height);

44+ ctx.strokeStyle = "#000000";

45+ ctx.lineWidth = 1

46+ ctx.fillStyle = "#ffffff";

47+ ctx.globalAlpha = 1.0;

48+ ctx.lineJoin = "round";

49+ ctx.beginPath();

50+

51+ // put rectangle in the middle

52+ // draw the rectangle

53+ ctx.moveTo(width/2,height);

54+ ctx.lineTo(width, height/2);

55+ ctx.lineTo(0,0);

56+

57+ ctx.closePath();

58+ ctx.fill();

59+ ctx.stroke();

60+ ctx.restore();

61+ }

62+

63+ Connections {

64+ target: UInput

65+ onMouseMoved: {

66+ var newX = root.x;

67+ newX += dx;

68+ if (newX < 0) newX = 0;

69+ else if (newX >= parent.width) newX = parent.width-1;

70+

71+ var newY = root.y;

72+ newY += dy;

73+ if (newY < 0) newY = 0;

74+ else if (newY >= parent.height) newY = parent.height-1;

75+

76+ root.x = newX;

77+ root.y = newY;

78+ root.mouseMoved();

79+ }

80+ }

3481}

82+

tests/mocks/GSettings.1.0/plugin.cpp+12

@@ -18,6 +18,8 @@

1818#include "fake_gsettings.h"

1919

2020#include <QtQml/qqml.h>

21+#include <QQmlEngine>

22+#include <QQmlContext>

2123

2224static QObject* controllerProvider(QQmlEngine* /* engine */, QJSEngine* /* scriptEngine */)

2325{

@@ -31,3 +33,13 @@ void FakeGSettingsQmlPlugin::registerTypes(const char *uri)

3133 qmlRegisterUncreatableType<GSettingsSchemaQml>(uri, 1, 0, "GSettingsSchema",

3234 "GSettingsSchema can only be used inside of a GSettings component");

3335}

36+

37+void FakeGSettingsQmlPlugin::initializeEngine(QQmlEngine *engine, const char *uri)

38+{

39+ QQmlExtensionPlugin::initializeEngine(engine, uri);

40+

41+ QString usageType = qgetenv("UNITY_MOCK_DESKTOP");

42+ if (!usageType.isEmpty()) {

43+ GSettingsControllerQml::instance()->setUsageMode("Windowed");

44+ }

45+}

tests/mocks/GSettings.1.0/plugin.h+1

@@ -26,6 +26,7 @@ class FakeGSettingsQmlPlugin : public QQmlExtensionPlugin

2626

2727public:

2828 void registerTypes(const char *uri) override;

29+ void initializeEngine(QQmlEngine *engine, const char *uri) override;

2930};

3031

3132#endif // PLUGIN_H

tests/mocks/UInput/plugin.cpp+6−1

@@ -19,8 +19,13 @@

1919

2020#include <QtQml/qqml.h>

2121

22+QObject* uinputSingleton(QQmlEngine*, QJSEngine*)

23+{

24+ return new MockUInput;

25+}

26+

2227void MockUInputPlugin::registerTypes(const char *uri)

2328{

2429 Q_ASSERT(uri == QLatin1String("UInput"));

25− qmlRegisterType<MockUInput>(uri, 0, 1, "UInput");

30+ qmlRegisterSingletonType<MockUInput>(uri, 0, 1, "UInput", uinputSingleton);

2631}

tests/mocks/Unity/Application/MirSurfaceItem.cpp+5

@@ -293,6 +293,10 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)

293293 connect(m_qmlSurface, &MirSurface::screenshotUrlChanged, this, &MirSurfaceItem::updateScreenshot);

294294 connect(m_qmlSurface, &MirSurface::liveChanged, this, &MirSurfaceItem::liveChanged);

295295 connect(m_qmlSurface, &MirSurface::stateChanged, this, &MirSurfaceItem::surfaceStateChanged);

296+ connect(m_qmlSurface, &MirSurface::sizeChanged, this, [this] () {

297+ m_qmlItem->setSize(m_qmlSurface->size());

298+ setImplicitSize(m_qmlSurface->width(), m_qmlSurface->height());

299+ });

296300

297301 QUrl qmlComponentFilePath;

298302 if (!m_qmlSurface->qmlFilePath().isEmpty()) {

@@ -387,6 +391,7 @@ void MirSurfaceItem::updateSurfaceSize()

387391 m_qmlItem->setWidth(m_surfaceWidth);

388392 m_qmlItem->setHeight(m_surfaceHeight);

389393 }

394+ qDebug() << this << "setting implicitsize" << m_surfaceWidth << m_surfaceHeight;

390395 setImplicitSize(m_surfaceWidth, m_surfaceHeight);

391396 }

392397}

tests/mocks/Unity/Application/SurfaceManager.cpp+1−1

@@ -21,7 +21,7 @@

2121

2222#include <paths.h>

2323

24−#define SURFACEMANAGER_DEBUG 0

24+#define SURFACEMANAGER_DEBUG 1

2525

2626#if SURFACEMANAGER_DEBUG

2727#define DEBUG_MSG(params) qDebug().nospace() << "SurfaceManager[" << (void*)this << "]::" << __func__ << params

tests/mocks/Unity/InputInfo/InputWindow.qmlnew file+68

@@ -0,0 +1,68 @@

1+import QtQuick 2.4

2+import Ubuntu.Components 1.3

3+import Unity.InputInfo 0.1

4+

5+Rectangle {

6+ id: rect

7+ color: "white"

8+ width: parent.width

9+ height: parent.height

10+

11+ Action {

12+ id: mouseAction

13+ text: checked ? "Remove Mouse" : "Add Mouse"

14+ onTriggered: {

15+ if (checked) {

16+ console.log("ADD")

17+ MockInputDeviceBackend.addMockDevice("/mouse0", InputInfo.Mouse);

18+ } else {

19+ console.log("REMOVE")

20+ MockInputDeviceBackend.removeDevice("/mouse0");

21+ }

22+ }

23+ iconName: "input-mouse-symbolic"

24+ checkable: true

25+ checked: false

26+ }

27+

28+ Action {

29+ id: kbAction

30+ text: checked ? "Remove Keyboard" : "Add Keyboard"

31+ onTriggered: {

32+ if (checked) {

33+ MockInputDeviceBackend.addMockDevice("/kbd0", InputInfo.Keyboard);

34+ } else {

35+ MockInputDeviceBackend.removeDevice("/kbd0");

36+ }

37+ }

38+ iconName: "input-keyboard-symbolic"

39+ checkable: true

40+ checked: false

41+ }

42+

43+ Column {

44+ anchors {

45+ fill: parent

46+ margins: units.gu(1)

47+ }

48+ spacing: units.gu(1)

49+

50+ Button {

51+ anchors {

52+ left: parent.left

53+ right: parent.right

54+ }

55+ action: mouseAction

56+ color: mouseAction.checked ? UbuntuColors.red : UbuntuColors.green

57+ }

58+

59+ Button {

60+ anchors {

61+ left: parent.left

62+ right: parent.right

63+ }

64+ action: kbAction

65+ color: kbAction.checked ? UbuntuColors.red : UbuntuColors.green

66+ }

67+ }

68+}

tests/mocks/Unity/InputInfo/mockcontroller.cpp+24−2

@@ -18,10 +18,32 @@

1818

1919#include "qinputdeviceinfo_mock_p.h"

2020

21−MockController::MockController(QObject *parent):

22− QObject(parent)

21+#include <QQuickView>

22+#include <QQmlComponent>

23+#include <QQuickItem>

24+#include <paths.h>

25+

26+MockController::MockController(QQmlEngine *engine)

2327{

28+ QQmlComponent component(engine);

29+ component.setData("import QtQuick 2.4; import Unity.InputInfo 0.1; InputWindow { }", ::qmlDirectory());

30+ QObject *myObject = component.create();

31+ QQuickItem *item = qobject_cast<QQuickItem*>(myObject);

32+ if (item) {

33+ auto window = new QQuickView();

34+ window->setTitle("Input");

35+ item->setParentItem(window->contentItem());

36+ window->setResizeMode(QQuickView::SizeRootObjectToView);

37+ window->setWidth(200);

38+ window->setHeight(100);

39+ window->show();

40+ }

41+}

2442

43+MockController *MockController::instance(QQmlEngine *engine)

44+{

45+ static MockController* controller = new MockController(engine);

46+ return controller;

2547}

2648

2749QInputDevice *MockController::addMockDevice(const QString &devicePath, QInputDevice::InputType type)

tests/mocks/Unity/InputInfo/mockcontroller.h+5−1

@@ -20,13 +20,17 @@

2020#include <QObject>

2121#include "qinputinfo.h"

2222

23+class QQmlEngine;

24+

2325class MockController: public QObject

2426{

2527 Q_OBJECT

2628public:

27− MockController(QObject *parent = 0);

29+ MockController(QQmlEngine *engine);

2830 ~MockController() = default;

2931

32+ static MockController *instance(QQmlEngine *engine);

33+

3034 Q_INVOKABLE QInputDevice* addMockDevice(const QString &devicePath, QInputDevice::InputType type);

3135 Q_INVOKABLE void removeDevice(const QString &devicePath);

3236};

tests/mocks/Unity/InputInfo/plugin.cpp+1−2

@@ -26,9 +26,8 @@

2626

2727static QObject *backendProvider(QQmlEngine *engine, QJSEngine *scriptEngine)

2828{

29− Q_UNUSED(engine)

3029 Q_UNUSED(scriptEngine)

31− return new MockController(engine);

30+ return MockController::instance(engine);

3231}

3332

3433void InputInfoPlugin::registerTypes(const char *uri)

tests/mocks/Unity/InputInfo/qmldir+2

@@ -1,2 +1,4 @@

11module Unity.InputInfo

22plugin MockInputInfo

3+

4+InputWindow 0.1 InputWindow.qml

tests/mocks/Unity/Screens/CMakeLists.txt+2−1

@@ -5,10 +5,11 @@ include_directories(

55set(MockScreens_SOURCES

66 plugin.cpp

77 screens.cpp

8+ screenwindow.cpp

89)

910

1011add_library(MockScreensPlugin MODULE ${MockScreens_SOURCES})

1112

12−qt5_use_modules(MockScreensPlugin Gui Qml)

13+qt5_use_modules(MockScreensPlugin Gui Qml Quick)

1314

1415add_unity8_mock(Unity.Screens 0.1 Unity/Screens PREFIX mocks TARGETS MockScreensPlugin)

tests/mocks/Unity/Screens/plugin.cpp+12−1

@@ -16,14 +16,25 @@

1616

1717#include "plugin.h"

1818#include "screens.h"

19+#include "screenwindow.h"

1920

2021#include <QScreen>

2122

23+namespace {

24+QObject* screensSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

25+ Q_UNUSED(engine);

26+ Q_UNUSED(scriptEngine);

27+ return new Screens();

28+}

29+}

30+

2231void UnityScreensPlugin::registerTypes(const char* uri)

2332{

2433 Q_ASSERT(QLatin1String(uri) == QLatin1String("Unity.Screens"));

2534

2635 qRegisterMetaType<QScreen*>("QScreen*");

2736

28− qmlRegisterType<Screens>(uri, 0, 1, "Screens");

37+ qmlRegisterSingletonType<Screens>(uri, 0, 1, "Screens", screensSingleton);

38+ qmlRegisterType<ScreenWindow>(uri, 0, 1, "ScreenWindow");

39+ qmlRegisterRevision<QWindow,1>(uri, 0, 1);

2940}

tests/mocks/Unity/Screens/screens.cpp+40−2

@@ -26,8 +26,20 @@ Q_DECLARE_METATYPE(QScreen*)

2626Screens::Screens(QObject *parent) :

2727 QAbstractListModel(parent)

2828{

29− // start with one screen attached

30− m_screenList.append(new Screen());

29+ bool ok = false;

30+ int screenCount = qEnvironmentVariableIntValue("UNITY_MOCK_SCREEN_COUNT", &ok);

31+ if (!ok) screenCount = 1;

32+ QPoint lastPoint(0,0);

33+ for (int i = 0; i < screenCount; ++i) {

34+ auto screen = new Screen();

35+ screen->enabled = i == 0;

36+ screen->name = QString("Monitor %1").arg(i);

37+ screen->sizes = { QSize(640,480), QSize(1024,748), QSize(1280,1024), QSize(1440,900), QSize(1920,1080) };

38+ screen->geometry = QRect(lastPoint.x(), lastPoint.y(), 1024, 786 );

39+ m_screenList.append(screen);

40+

41+ lastPoint.rx() += screen->geometry.width();

42+ }

3143}

3244

3345Screens::~Screens()

@@ -41,6 +53,12 @@ QHash<int, QByteArray> Screens::roleNames() const

4153 QHash<int, QByteArray> roles;

4254 roles[ScreenRole] = "screen";

4355 roles[OutputTypeRole] = "outputType";

56+ roles[EnabledRole] = "enabled";

57+ roles[NameRole] = "name";

58+ roles[ScaleRole] = "scale";

59+ roles[FormFactorRole] = "formFactor";

60+ roles[GeometryRole] = "geometry";

61+ roles[SizesRole] = "sizes";

4462 return roles;

4563}

4664

@@ -52,9 +70,29 @@ QVariant Screens::data(const QModelIndex &index, int role) const

5270

5371 switch(role) {

5472 case ScreenRole:

73+ qDebug() << "returning" << m_screenList.at(index.row())->qScreen;

5574 return QVariant::fromValue(m_screenList.at(index.row())->qScreen);

5675 case OutputTypeRole:

5776 return m_screenList.at(index.row())->outputTypes;

77+ case EnabledRole:

78+ return m_screenList.at(index.row())->enabled;

79+ case NameRole:

80+ return m_screenList.at(index.row())->name;

81+ case ScaleRole:

82+ return m_screenList.at(index.row())->scale;

83+ case FormFactorRole:

84+ return m_screenList.at(index.row())->formFactor;

85+ case GeometryRole:

86+ return m_screenList.at(index.row())->geometry;

87+ case SizesRole:

88+ {

89+ QVariantList sizes;

90+ auto availableSizes = m_screenList.at(index.row())->sizes;

91+ Q_FOREACH(auto size, availableSizes) {

92+ sizes.append(QVariant(size));

93+ }

94+ return sizes;

95+ }

5896 }

5997

6098 return QVariant();

tests/mocks/Unity/Screens/screens.h+23−1

@@ -26,13 +26,20 @@ class Screens : public QAbstractListModel

2626{

2727 Q_OBJECT

2828 Q_ENUMS(OutputTypes)

29+ Q_ENUMS(FormFactor)

2930

3031 Q_PROPERTY(int count READ count NOTIFY countChanged)

3132

3233public:

3334 enum ItemRoles {

3435 ScreenRole = Qt::UserRole + 1,

35− OutputTypeRole

36+ OutputTypeRole,

37+ EnabledRole,

38+ NameRole,

39+ ScaleRole,

40+ FormFactorRole,

41+ GeometryRole,

42+ SizesRole

3643 };

3744

3845 enum OutputTypes {

@@ -53,6 +60,15 @@ public:

5360 EDP

5461 };

5562

63+ enum FormFactor {

64+ FormFactorUnknown,

65+ FormFactorPhone,

66+ FormFactorTablet,

67+ FormFactorMonitor,

68+ FormFactorTV,

69+ FormFactorProjector,

70+ };

71+

5672 explicit Screens(QObject *parent = 0);

5773 virtual ~Screens() noexcept;

5874

@@ -77,6 +93,12 @@ class Screen

7793public:

7894 Screens::OutputTypes outputTypes = Screens::Unknown;

7995 QScreen *qScreen = nullptr;

96+ bool enabled = false;

97+ QString name = QString();

98+ float scale = 1.0;

99+ Screens::FormFactor formFactor = Screens::FormFactorMonitor;

100+ QRect geometry;

101+ QList<QSize> sizes;

80102};

81103

82104#endif // SCREENS_H

tests/mocks/Unity/Screens/screenwindow.cppnew file+32

@@ -0,0 +1,32 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "screenwindow.h"

18+

19+ScreenWindow::ScreenWindow(QWindow *parent)

20+ : QQuickWindow(parent)

21+{

22+}

23+

24+QScreen *ScreenWindow::screen() const

25+{

26+ return QQuickWindow::screen();

27+}

28+

29+void ScreenWindow::setScreen(QScreen *screen)

30+{

31+ QQuickWindow::setScreen(screen);

32+}

tests/mocks/Unity/Screens/screenwindow.hnew file+36

@@ -0,0 +1,36 @@

1+/*

3+ *

4+ * This program is free software: you can redistribute it and/or modify it under

5+ * the terms of the GNU Lesser General Public License version 3, as published by

6+ * the Free Software Foundation.

7+ *

8+ * This program is distributed in the hope that it will be useful, but WITHOUT

9+ * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,

10+ * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

11+ * Lesser General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU Lesser General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef SCREENWINDOW_H

18+#define SCREENWINDOW_H

19+

20+#include <QQuickWindow>

21+

22+class ScreenWindow : public QQuickWindow

23+{

24+ Q_OBJECT

25+ Q_PROPERTY(QScreen *screen READ screen WRITE setScreen NOTIFY screenChanged)

26+public:

27+ ScreenWindow(QWindow *parent = 0);

28+

29+ QScreen *screen() const;

30+ void setScreen(QScreen *screen);

31+

32+Q_SIGNALS:

33+ void screenChanged(QScreen *screen);

34+};

35+

36+#endif // SCREENWINDOW_H

tests/qmltests/Components/tst_VirtualTouchPad.qml+2−2

@@ -39,11 +39,11 @@ Rectangle {

3939

4040 SignalSpy {

4141 id: mouseEventSpy1

42− target: touchScreenPad.uinput

42+ target: UInput

4343 }

4444 SignalSpy {

4545 id: mouseEventSpy2

46− target: touchScreenPad.uinput

46+ target: UInput

4747 }

4848

4949 UnityTestCase {

tests/qmltests/Panel/tst_Panel.qml+9−8

@@ -23,7 +23,6 @@ import Unity.Application 0.1

2323import Unity.Indicators 0.1 as Indicators

2424import Ubuntu.Telephony 0.1 as Telephony

2525import "../../../qml/Panel"

26−import "../../../qml/Components/PanelState"

2726

2827IndicatorTest {

2928 id: root

@@ -33,6 +32,8 @@ IndicatorTest {

3332

3433 Component.onCompleted: theme.name = "Ubuntu.Components.Themes.SuruDark"

3534

35+ readonly property alias panelState: panel.panelState

36+

3637 SurfaceManager {}

3738

3839 Binding {

@@ -109,7 +110,7 @@ IndicatorTest {

109110 Layout.fillWidth: true

110111 CheckBox {

111112 id: windowControlsCB

112− onClicked: PanelState.buttonsVisible = checked

113+ onClicked: panelState.buttonsVisible = checked

113114 }

114115 Label {

115116 text: "Show window controls"

@@ -121,9 +122,9 @@ IndicatorTest {

121122 CheckBox {

122123 onClicked: {

123124 if (checked)

124− PanelState.title = "Fake window title"

125+ panelState.title = "Fake window title"

125126 else

126− PanelState.title = ""

127+ panelState.title = ""

127128 }

128129 }

129130 Label {

@@ -186,7 +187,7 @@ IndicatorTest {

186187

187188 SignalSpy {

188189 id: windowControlButtonsSpy

189− target: PanelState

190+ target: panelState

190191 signalName: "closeClicked"

191192 }

192193

@@ -510,13 +511,13 @@ IndicatorTest {

510511

511512 // https://bugs.launchpad.net/ubuntu/+source/unity8/+bug/1611959

512513 function test_windowControlButtonsFittsLaw() {

513− var buttonsVisible = PanelState.buttonsVisible;

514− PanelState.buttonsVisible = true;

514+ var buttonsVisible = panelState.buttonsVisible;

515+ panelState.buttonsVisible = true;

515516 // click in very topleft corner and verify the close button got clicked too

516517 mouseMove(panel, 0, 0);

517518 mouseClick(panel, 0, 0, undefined /*button*/, undefined /*modifiers*/, 100 /*short delay*/);

518519 compare(windowControlButtonsSpy.count, 1);

519− PanelState.buttonsVisible = buttonsVisible;

520+ panelState.buttonsVisible = buttonsVisible;

520521 }

521522 }

522523}

tests/qmltests/Stage/tst_DesktopStage.qml+8−3

@@ -41,6 +41,10 @@ Item {

4141 value: false

4242 }

4343

44+ PanelState {

45+ id: panelState

46+ }

47+

4448 Component.onCompleted: {

4549 theme.name = "Ubuntu.Components.Themes.SuruDark";

4650 resetGeometry();

@@ -92,6 +96,7 @@ Item {

9296 topLevelSurfaceList: topSurfaceList

9397 interactive: true

9498 mode: "windowed"

99+ panelState: panelState

95100 }

96101 }

97102

@@ -624,19 +629,19 @@ Item {

624629 maximizeDelegate(facebookAppDelegate);

625630

626631 // verify the drop shadow is still not visible

627− verify(PanelState.dropShadow == false);

632+ verify(panelState.dropShadow == false);

628633

629634 // start a foreground app, not maximized

630635 var dialerAppDelegate = startApplication("dialer-app");

631636

632637 // verify the drop shadow becomes visible

633− verify(PanelState.dropShadow == true);

638+ verify(panelState.dropShadow == true);

634639

635640 // close the maximized app

636641 ApplicationManager.stopApplication("facebook-webapp");

637642

638643 // verify the drop shadow is gone

639− tryCompare(PanelState, "dropShadow", false);

644+ tryCompare(panelState, "dropShadow", false);

640645 }

641646

642647 function test_threeFingerTapShowsWindowControls_data() {

tests/qmltests/Stage/tst_WindowResizeArea.qml+1−8

@@ -19,7 +19,6 @@ import QtQuick.Layouts 1.1

1919import QtTest 1.0

2020import Unity.Test 0.1

2121import ".."

22−import "../../../qml/Components/PanelState"

2322import "../../../qml/Stage"

2423import Ubuntu.Components 1.3

2524import Ubuntu.Components.ListItems 1.3 as ListItem

@@ -31,12 +30,6 @@ Item {

3130 height: units.gu(60)

3231 width: units.gu(85)

3332

34− Binding {

35− target: PanelState

36− property: "panelHeight"

37− value: units.gu(3)

38− }

39−

4033 Component {

4134 id: fakeWindowComponent

4235

@@ -352,7 +345,7 @@ Item {

352345

353346 // Make sure it's again where we left it in normal state before destroying

354347 compare(fakeWindow.requestedX >= 0, true)

355− compare(fakeWindow.requestedY >= PanelState.panelHeight, true)

348+ compare(fakeWindow.requestedY >= 0, true)

356349 compare(fakeWindow.requestedX + fakeWindow.width <= root.width, true)

357350 compare(fakeWindow.requestedY + fakeWindow.height <= root.height, true)

358351

tests/qmltests/tst_OrientedShell.qml+24−5

@@ -29,7 +29,6 @@ import Utils 0.1

2929

3030import "../../qml"

3131import "../../qml/Components"

32−import "../../qml/Components/PanelState"

3332import "Stage"

3433

3534Rectangle {

@@ -75,6 +74,12 @@ Rectangle {

7574 deviceFilter: InputInfo.Keyboard

7675 }

7776

77+ QtObject {

78+ id: _screenWindow

79+ property bool primary: true

80+ }

81+ property alias screenWindow: _screenWindow

82+

7883 property int physicalOrientation0

7984 property int physicalOrientation90

8085 property int physicalOrientation180

@@ -167,6 +172,11 @@ Rectangle {

167172 Component.onDestruction: {

168173 orientedShellLoader.itemDestroyed = true;

169174 }

175+

176+ SurfaceManager {

177+ id: surfaceMan

178+ }

179+ surfaceManager: surfaceMan

170180 }

171181 }

172182 }

@@ -439,6 +449,15 @@ Rectangle {

439449 property Item orientedShell: orientedShellLoader.status === Loader.Ready ? orientedShellLoader.item : null

440450 property Item shell

441451 property QtObject topLevelSurfaceList

452+ property var panelState: undefined

453+

454+ onOrientedShellChanged: {

455+ if (orientedShell) {

456+ panelState = findInvisibleChild(orientedShell, "panelState");

457+ } else {

458+ panelState = undefined;

459+ }

460+ }

442461

443462 SignalSpy { id: signalSpy }

444463 SignalSpy { id: signalSpy2 }

@@ -1507,13 +1526,13 @@ Rectangle {

15071526 print("exptectedAngle", expectedAngle, point.x, point.y)

15081527 switch (expectedAngle) {

15091528 case 0:

1510− return point.x === 0 && point.y === PanelState.panelHeight;

1529+ return point.x === 0 && point.y === panelState.panelHeight;

15111530 case 90:

1512− return point.x === orientedShell.width - PanelState.panelHeight && point.y === 0;

1531+ return point.x === orientedShell.width - panelState.panelHeight && point.y === 0;

15131532 case 180:

1514− return point.x === orientedShell.width && point.y === orientedShell.height - PanelState.panelHeight;

1533+ return point.x === orientedShell.width && point.y === orientedShell.height - panelState.panelHeight;

15151534 default: // 270

1516− return point.x === PanelState.panelHeight && point.y === orientedShell.height;

1535+ return point.x === panelState.panelHeight && point.y === orientedShell.height;

15171536 }

15181537 }

15191538

tests/qmltests/tst_Shell.qml+25−11

@@ -55,12 +55,21 @@ Rectangle {

5555 onShellChanged: {

5656 if (shell) {

5757 topLevelSurfaceList = testCase.findInvisibleChild(shell, "topLevelSurfaceList");

58+ panelState = testCase.findInvisibleChild(shell, "panelState");

5859 } else {

5960 topLevelSurfaceList = null;

61+ panelState = undefined;

6062 }

6163 }

6264

6365 property var topLevelSurfaceList: null

66+ property var panelState: undefined

67+

68+ QtObject {

69+ id: _screenWindow

70+ property bool primary: false

71+ }

72+ property alias screenWindow: _screenWindow

6473

6574 Item {

6675 id: shellContainer

@@ -135,6 +144,11 @@ Rectangle {

135144 Component.onDestruction: {

136145 shellLoader.itemDestroyed = true;

137146 }

147+

148+ SurfaceManager {

149+ id: surfaceMan

150+ }

151+ surfaceManager: surfaceMan

138152 }

139153 }

140154 }

@@ -671,7 +685,7 @@ Rectangle {

671685 }

672686

673687 function ensureInputMethodSurface() {

674− var surfaceManager = findInvisibleChild(shell, "surfaceManager");

688+ var surfaceManager = shell.surfaceManager;

675689 verify(surfaceManager);

676690 surfaceManager.createInputMethodSurface();

677691

@@ -1878,21 +1892,21 @@ Rectangle {

18781892 var maximizeButton = findChild(appDelegate, "maximizeWindowButton");

18791893

18801894 tryCompare(appDelegate, "state", "normal");

1881− tryCompare(PanelState, "buttonsVisible", false)

1895+ tryCompare(panelState, "buttonsVisible", false)

18821896

18831897 mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);

18841898 tryCompare(appDelegate, "state", "maximized");

1885− tryCompare(PanelState, "buttonsVisible", true)

1899+ tryCompare(panelState, "buttonsVisible", true)

18861900

18871901 ApplicationManager.stopApplication(application.appId);

1888− tryCompare(PanelState, "buttonsVisible", false)

1902+ tryCompare(panelState, "buttonsVisible", false)

18891903

18901904 // wait until all zombie surfaces are gone. As MirSurfaceItems hold references over them.

18911905 // They won't be gone until those surface items are destroyed.

18921906 tryCompareFunction(function() { return application.surfaceList.count }, 0);

18931907

18941908 ApplicationManager.startApplication(application.appId);

1895− tryCompare(PanelState, "buttonsVisible", true)

1909+ tryCompare(panelState, "buttonsVisible", true)

18961910 }

18971911

18981912 function test_newAppHasValidGeometry() {

@@ -1948,7 +1962,7 @@ Rectangle {

19481962 mousePress(appDelegate, appDelegate.width / 2, units.gu(1))

19491963 mouseMove(appDelegate, appDelegate.width / 2, -units.gu(100))

19501964

1951− compare(appDelegate.y >= PanelState.panelHeight, true);

1965+ compare(appDelegate.y >= panelState.panelHeight, true);

19521966 }

19531967

19541968 function test_cantResizeWindowUnderPanel() {

@@ -1976,7 +1990,7 @@ Rectangle {

19761990 mouseMove(decoration, decoration.width/2, -units.gu(100));

19771991

19781992 // verify we don't go past the panel

1979− compare(appDelegate.y >= PanelState.panelHeight, true);

1993+ compare(appDelegate.y >= panelState.panelHeight, true);

19801994 }

19811995

19821996 function test_restoreWindowStateFixesIfUnderPanel() {

@@ -2000,7 +2014,7 @@ Rectangle {

20002014 tryCompareFunction(function () { return topLevelSurfaceList.applicationAt(0).appId; }, application.appId);

20012015

20022016 appDelegate = appRepeater.itemAt(0);

2003− compare(appDelegate.y >= PanelState.panelHeight, true);

2017+ compare(appDelegate.y >= panelState.panelHeight, true);

20042018 }

20052019

20062020 function test_lifecyclePolicyForNonTouchApp_data() {

@@ -2601,7 +2615,7 @@ Rectangle {

26012615 function test_oskDisplacesWindow_data() {

26022616 return [

26032617 {tag: "no need to displace", windowHeight: units.gu(10), windowY: units.gu(5), targetDisplacement: units.gu(5), oskEnabled: true},

2604− {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: PanelState.panelHeight, oskEnabled: true},

2618+ {tag: "displace to top", windowHeight: units.gu(50), windowY: units.gu(10), targetDisplacement: panelState.panelHeight, oskEnabled: true},

26052619 {tag: "osk not on this screen", windowHeight: units.gu(40), windowY: units.gu(10), targetDisplacement: units.gu(10), oskEnabled: false},

26062620 ]

26072621 }

@@ -2624,8 +2638,8 @@ Rectangle {

26242638 dashAppDelegate.windowedY = data.windowY;

26252639 topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, 0, 0, 0));

26262640 var initialY = dashAppDelegate.y;

2627− print("intial", initialY, "panel", PanelState.panelHeight);

2628− verify(initialY > PanelState.panelHeight);

2641+ print("intial", initialY, "panel", panelState.panelHeight);

2642+ verify(initialY > panelState.panelHeight);

26292643

26302644 topLevelSurfaceList.inputMethodSurface.setInputBounds(Qt.rect(0, root.height / 2, root.width, root.height / 2));

26312645 tryCompare(dashAppDelegate, "y", data.targetDisplacement);