d47a390 · unity8 · git.iko.soy

plugins/Utils/WindowInputMonitor.cpp+28−5

compare with xenial

unifiedsplit

@@ -56,14 +56,13 @@ bool WindowInputMonitor::eventFilter(QObject *watched, QEvent *event)

56 Q_ASSERT(watched == static_cast<QObject*>(m_filteredWindow.data()));

57 Q_UNUSED(watched);

58

59− update(event);

59+ return update(event);

60−

61− // We're only monitoring, never filtering out events

62− return false;

63}

60}

64

61

65−void WindowInputMonitor::update(QEvent *event)

62+bool WindowInputMonitor::update(QEvent *event)

66{

63{

64+ bool result = false; // by default, just monitor

65+

67 if (event->type() == QEvent::KeyPress) {

66 if (event->type() == QEvent::KeyPress) {

68 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);

67 QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);

69

68

@@ -81,6 +80,11 @@ void WindowInputMonitor::update(QEvent *event)

81 if (keyEvent->key() == m_pressedHomeKey) {

80 if (keyEvent->key() == m_pressedHomeKey) {

82 m_pressedHomeKey = 0;

81 m_pressedHomeKey = 0;

83 }

82 }

83+ if (m_movingWindow && keyEvent->modifiers() == Qt::AltModifier) {

84+ m_movingWindow = false;

85+ result = true;

86+ Q_EMIT windowMoveEnded();

87+ }

84

88

85 } else if (event->type() == QEvent::TouchBegin) {

89 } else if (event->type() == QEvent::TouchBegin) {

86

90

@@ -98,7 +102,26 @@ void WindowInputMonitor::update(QEvent *event)

98 const QPointF pos = touchEv->touchPoints().last().screenPos();

102 const QPointF pos = touchEv->touchPoints().last().screenPos();

99 Q_EMIT touchEnded(pos);

103 Q_EMIT touchEnded(pos);

100 }

104 }

105+ } else if (event->type() == QEvent::MouseButtonPress) {

106+ QMouseEvent * mouseEv = static_cast<QMouseEvent *>(event);

107+ if (mouseEv && mouseEv->button() == Qt::LeftButton && mouseEv->modifiers() == Qt::AltModifier) {

108+ m_movingWindow = true;

109+ result = true;

110+ Q_EMIT windowMoveRequested(mouseEv->screenPos());

111+ }

112+ } else if (event->type() == QEvent::MouseMove && m_movingWindow) {

113+ QMouseEvent * mouseEv = static_cast<QMouseEvent *>(event);

114+ if (mouseEv) {

115+ result = true;

116+ Q_EMIT windowMoveUpdated(mouseEv->screenPos());

117+ }

118+ } else if (event->type() == QEvent::MouseButtonRelease && m_movingWindow) {

119+ m_movingWindow = false;

120+ result = true;

121+ Q_EMIT windowMoveEnded();

101 }

122 }

123+

124+ return result;

102}

125}

103

126

104void WindowInputMonitor::setupFilterOnWindow(QQuickWindow *window)

127void WindowInputMonitor::setupFilterOnWindow(QQuickWindow *window)

plugins/Utils/WindowInputMonitor.h+9−4

@@ -29,25 +29,25 @@

29 * key presses.

30 *

31 * Additionally, this class monitors for generic touch events on the screen, to

32− * help with hiding/revealing the mouse pointer.

32+ * help with hiding/revealing the mouse pointer and moving window around with Alt+LMB

33 */

34class WindowInputMonitor : public QQuickItem

35{

36 Q_OBJECT

37public:

38

39− WindowInputMonitor(QQuickItem *parent = 0);

39+ WindowInputMonitor(QQuickItem *parent = nullptr);

40

41 // for testing

42 WindowInputMonitor(UnityUtil::AbstractTimer *timer,

43 UnityUtil::AbstractElapsedTimer *elapsedTimer,

44− QQuickItem *parent = 0);

44+ QQuickItem *parent = nullptr);

45

46 virtual ~WindowInputMonitor();

47

48 bool eventFilter(QObject *watched, QEvent *event) override;

49

50− void update(QEvent *event);

50+ bool update(QEvent *event);

51

52 const qint64 msecsWithoutTouches = 150;

53

@@ -77,6 +77,10 @@ Q_SIGNALS:

77 */

78 void touchEnded(const QPointF &pos);

79

80+ void windowMoveRequested(const QPointF &scenePos);

81+ void windowMoveUpdated(const QPointF &scenePos);

82+ void windowMoveEnded();

83+

80private Q_SLOTS:

84private Q_SLOTS:

81 void setupFilterOnWindow(QQuickWindow *window);

85 void setupFilterOnWindow(QQuickWindow *window);

82 void emitActivatedIfNoTouchesAround();

86 void emitActivatedIfNoTouchesAround();

@@ -92,6 +96,7 @@ private:

92 // Which Qt::Key from m_homeKeys is currently pressed.

96 // Which Qt::Key from m_homeKeys is currently pressed.

93 // 0 if none

97 // 0 if none

94 int m_pressedHomeKey{0};

98 int m_pressedHomeKey{0};

99+ bool m_movingWindow{false};

95};

100};

96

101

97#endif // UNITY_WINDOWINPUTMONITOR_H

102#endif // UNITY_WINDOWINPUTMONITOR_H

qml/Shell.qml+15

@@ -260,6 +260,21 @@ StyledItem {

260 cursor.y = mappedCoords.y;

261 cursor.mouseNeverMoved = false;

262 }

263+ onWindowMoveRequested: {

264+ if (applicationsDisplayLoader.item && applicationsDisplayLoader.item.windowMoveRequested) {

265+ applicationsDisplayLoader.item.windowMoveRequested(scenePos);

266+ }

267+ }

268+ onWindowMoveUpdated: {

269+ if (applicationsDisplayLoader.item && applicationsDisplayLoader.item.windowMoveUpdated) {

270+ applicationsDisplayLoader.item.windowMoveUpdated(scenePos);

271+ }

272+ }

273+ onWindowMoveEnded: {

274+ if (applicationsDisplayLoader.item && applicationsDisplayLoader.item.windowMoveEnded) {

275+ applicationsDisplayLoader.item.windowMoveEnded();

276+ }

277+ }

263 }

278 }

264

279

265 GSettings {

280 GSettings {

qml/Stages/DecoratedWindow.qml+2−1

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

55 property alias stageWidth: moveHandler.stageWidth

56 property alias stageHeight: moveHandler.stageHeight

57 readonly property alias dragging: moveHandler.dragging

58+ readonly property alias moveHandler: moveHandler

58

59

59 readonly property Item clientAreaItem: applicationWindow

60 readonly property Item clientAreaItem: applicationWindow

60

61

@@ -118,7 +119,7 @@ FocusScope {

118

119

119 MoveHandler {

120 MoveHandler {

120 id: moveHandler

121 id: moveHandler

121− anchors.fill: decoration

122+ anchors.fill: parent

122 objectName: "moveHandler"

123 objectName: "moveHandler"

123 target: root.parent

124 target: root.parent

124 buttonsWidth: decoration.buttonsWidth

125 buttonsWidth: decoration.buttonsWidth

qml/Stages/DesktopStage.qml+48−1

@@ -42,6 +42,38 @@ AbstractStage {

42 }

43 }

44

45+ // Alt+LMB handlers

46+ function windowMoveRequested(scenePos) {

47+ var candidate;

48+ if (priv.focusedAppDelegate && priv.focusedAppDelegate.contains(mapToItem(priv.focusedAppDelegate, scenePos.x, scenePos.y))) {

49+ candidate = priv.focusedAppDelegate;

50+ } else {

51+ candidate = appContainer.childAt(scenePos.x, scenePos.y);

52+ }

53+

54+ if (candidate && candidate.moveHandler) {

55+ print("!!! Window move requested", scenePos);

56+ var localPos = mapToItem(candidate, scenePos.x, scenePos.y)

57+ candidate.focus = true;

58+ candidate.moveHandler.handlePressedChanged(true, Qt.LeftButton, localPos.x, localPos.y);

59+ }

60+ }

61+ function windowMoveUpdated(scenePos) {

62+ if (priv.focusedAppDelegate) {

63+ print("!!! Window move updated", scenePos);

64+ var localPos = mapToItem(priv.focusedAppDelegate, scenePos.x, scenePos.y)

65+ priv.focusedAppDelegate.moveHandler.handlePositionChanged(localPos);

66+ }

67+ }

68+ function windowMoveEnded() {

69+ if (priv.focusedAppDelegate) {

70+ print("!!! Window move ended");

71+ priv.focusedAppDelegate.moveHandler.handlePressedChanged(false, Qt.LeftButton);

72+ priv.focusedAppDelegate.moveHandler.handleReleased();

73+ fakeRectangle.commit();

74+ }

75+ }

76+

45 // Used by TutorialRight

77 // Used by TutorialRight

46 property bool spreadShown: spread.state == "altTab"

78 property bool spreadShown: spread.state == "altTab"

47

79

@@ -248,6 +280,20 @@ AbstractStage {

248 source: root.background

280 source: root.background

249 }

281 }

250

282

283+ Timer { // fix a race condition between TopLevelSurfaceRepeater and app (usually dash) starting up; set a focusedAppDelegate

284+ running: !appRepeater.startingUp

285+ interval: 1

286+ onTriggered: {

287+ for (var i = 0; i < appRepeater.count; i++) {

288+ var appDelegate = appRepeater.itemAt(i);

289+ if (appDelegate && appDelegate.focus) {

290+ priv.focusedAppDelegate = appDelegate;

291+ break;

292+ }

293+ }

294+ }

295+ }

296+

251 TopLevelSurfaceRepeater {

297 TopLevelSurfaceRepeater {

252 id: appRepeater

298 id: appRepeater

253 model: topLevelSurfaceList

299 model: topLevelSurfaceList

@@ -350,7 +396,8 @@ AbstractStage {

350 readonly property var surface: model.surface

396 readonly property var surface: model.surface

351 readonly property alias resizeArea: resizeArea

397 readonly property alias resizeArea: resizeArea

352 readonly property alias focusedSurface: decoratedWindow.focusedSurface

398 readonly property alias focusedSurface: decoratedWindow.focusedSurface

353− readonly property bool dragging: touchControls.overlayShown ? touchControls.dragging : decoratedWindow.dragging

399+ readonly property bool dragging: moveHandler.dragging

400+ readonly property alias moveHandler: decoratedWindow.moveHandler // for Alt+LMB dragging

354

401

355 readonly property bool isDash: model.application.appId == "unity8-dash"

402 readonly property bool isDash: model.application.appId == "unity8-dash"

356 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem

403 readonly property alias clientAreaItem: decoratedWindow.clientAreaItem

qml/Stages/TabletStage.qml+17−1

@@ -699,6 +699,20 @@ AbstractStage {

699 }

700 }

701

702+ Timer { // fix a race condition between TopLevelSurfaceRepeater and app (usually dash) starting up; set a focusedAppDelegate

703+ running: !spreadRepeater.startingUp

704+ interval: 1

705+ onTriggered: {

706+ for (var i = 0; i < spreadRepeater.count; i++) {

707+ var appDelegate = spreadRepeater.itemAt(i);

708+ if (appDelegate && appDelegate.focus) {

709+ priv.focusedAppDelegate = appDelegate;

710+ break;

711+ }

712+ }

713+ }

714+ }

715+

702 TopLevelSurfaceRepeater {

716 TopLevelSurfaceRepeater {

703 id: spreadRepeater

717 id: spreadRepeater

704 objectName: "spreadRepeater"

718 objectName: "spreadRepeater"

@@ -763,7 +777,9 @@ AbstractStage {

763 onFocusChanged: {

777 onFocusChanged: {

764 if (focus && !spreadRepeater.startingUp) {

778 if (focus && !spreadRepeater.startingUp) {

765 priv.focusedAppDelegate = spreadTile;

779 priv.focusedAppDelegate = spreadTile;

780+ if (root.parent) {

766− root.topLevelSurfaceList.raiseId(model.id);

781+ root.topLevelSurfaceList.raiseId(model.id);

782+ }

767 }

783 }

768 if (focus && priv.sideStageEnabled && stage === ApplicationInfoInterface.SideStage) {

784 if (focus && priv.sideStageEnabled && stage === ApplicationInfoInterface.SideStage) {

769 sideStage.show();

785 sideStage.show();

tests/mocks/Utils/WindowInputMonitor.qml+4−1

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

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

@@ -20,4 +20,7 @@ QtObject {

20 signal homeKeyActivated()

21 signal touchBegun()

22 signal touchEnded(point pos)

23+ signal windowMoveRequested(point scenePos)

24+ signal windowMoveUpdated(point scenePos)

25+ signal windowMoveEnded()

23}

26}