23ba7e0 · unity8 · git.iko.soy

debian/control+1−1

@@ -29,7 +29,7 @@ Build-Depends: cmake,

2929 libqt5xmlpatterns5-dev,

3030 libsystemsettings-dev,

3131 libudev-dev,

32− libunity-api-dev (>= 7.102),

32+ libunity-api-dev (>= 7.101),

3333 libusermetricsoutput1-dev,

3434 libxcb1-dev,

3535 pkg-config,

plugins/Utils/windowstatestorage.cpp+61−22

@@ -47,26 +47,38 @@ WindowStateStorage::~WindowStateStorage()

4747 m_db.close();

4848}

4949

50−void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)

50+void WindowStateStorage::saveState(const QString &windowId, WindowStateStorage::WindowState state)

5151{

52− QMutexLocker mutexLocker(&s_mutex);

52+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO state (windowId, state) values ('%1', '%2');")

53+ .arg(windowId)

54+ .arg((int)state);

55+

56+ saveValue(queryString);

57+}

58+

59+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue) const

60+{

61+ const QString queryString = QStringLiteral("SELECT * FROM state WHERE windowId = '%1';")

62+ .arg(windowId);

5363

54− QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

64+ QSqlQuery query = getValue(queryString);

65+

66+ if (!query.first()) {

67+ return defaultValue;

68+ }

69+ return (WindowState)query.value("state").toInt();

70+}

71+

72+void WindowStateStorage::saveGeometry(const QString &windowId, const QRect &rect)

73+{

74+ const QString queryString = QStringLiteral("INSERT OR REPLACE INTO geometry (windowId, x, y, width, height) values ('%1', '%2', '%3', '%4', '%5');")

5575 .arg(windowId)

5676 .arg(rect.x())

5777 .arg(rect.y())

5878 .arg(rect.width())

5979 .arg(rect.height());

6080

61− QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

62− m_asyncQueries.append(future);

63−

64− QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

65− futureWatcher->setFuture(future);

66− connect(futureWatcher, &QFutureWatcher<void>::finished,

67− this,

68− [=](){ m_asyncQueries.removeAll(futureWatcher->future());

69− futureWatcher->deleteLater(); });

81+ saveValue(queryString);

7082}

7183

7284void WindowStateStorage::executeAsyncQuery(const QString &queryString)

@@ -82,20 +94,13 @@ void WindowStateStorage::executeAsyncQuery(const QString &queryString)

8294 }

8395}

8496

85−QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue)

97+QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defaultValue) const

8698{

87− QMutexLocker l(&s_mutex);

8899 QString queryString = QStringLiteral("SELECT * FROM geometry WHERE windowId = '%1';")

89100 .arg(windowId);

90− QSqlQuery query;

91101

92− bool ok = query.exec(queryString);

93− if (!ok) {

94− qWarning() << "Error retrieving window state for" << windowId

95− << "Driver error:" << query.lastError().driverText()

96− << "Database error:" << query.lastError().databaseText();

97− return defaultValue;

98− }

102+ QSqlQuery query = getValue(queryString);

103+

99104 if (!query.first()) {

100105 return defaultValue;

101106 }

@@ -114,4 +119,38 @@ void WindowStateStorage::initdb()

114119 QSqlQuery query;

115120 query.exec(QStringLiteral("CREATE TABLE geometry(windowId TEXT UNIQUE, x INTEGER, y INTEGER, width INTEGER, height INTEGER);"));

116121 }

122+

123+ if (!m_db.tables().contains("state")) {

124+ QSqlQuery query;

125+ query.exec("CREATE TABLE state(windowId TEXT UNIQUE, state INTEGER);");

126+ }

127+}

128+

129+void WindowStateStorage::saveValue(const QString &queryString)

130+{

131+ QMutexLocker mutexLocker(&s_mutex);

132+

133+ QFuture<void> future = QtConcurrent::run(executeAsyncQuery, queryString);

134+ m_asyncQueries.append(future);

135+

136+ QFutureWatcher<void> *futureWatcher = new QFutureWatcher<void>();

137+ futureWatcher->setFuture(future);

138+ connect(futureWatcher, &QFutureWatcher<void>::finished,

139+ this,

140+ [=](){ m_asyncQueries.removeAll(futureWatcher->future());

141+ futureWatcher->deleteLater(); });

142+}

143+

144+QSqlQuery WindowStateStorage::getValue(const QString &queryString) const

145+{

146+ QMutexLocker l(&s_mutex);

147+ QSqlQuery query;

148+

149+ bool ok = query.exec(queryString);

150+ if (!ok) {

151+ qWarning() << "Error retrieving database query:" << queryString

152+ << "Driver error:" << query.lastError().driverText()

153+ << "Database error:" << query.lastError().databaseText();

154+ }

155+ return query;

117156}

plugins/Utils/windowstatestorage.h+13−1

@@ -22,16 +22,28 @@

2222class WindowStateStorage: public QObject

2323{

2424 Q_OBJECT

25+ Q_ENUMS(WindowState)

2526public:

27+ enum WindowState {

28+ WindowStateNormal,

29+ WindowStateMaximized

30+ };

31+

2632 WindowStateStorage(QObject *parent = 0);

2733 virtual ~WindowStateStorage();

2834

35+ Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

36+ Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue) const;

37+

2938 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

30− Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);

39+ Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue) const;

3140

3241private:

3342 void initdb();

3443

44+ void saveValue(const QString &queryString);

45+ QSqlQuery getValue(const QString &queryString) const;

46+

3547 static void executeAsyncQuery(const QString &queryString);

3648 static QMutex s_mutex;

3749

qml/Components/Orientations.qmlnew file+29

@@ -0,0 +1,29 @@

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+

19+QtObject {

20+ // Just because "native" is a reserved keyword :(

21+ property int native_: Qt.PortraitOrientation

22+

23+ property int primary: Qt.PortraitOrientation

24+

25+ property int landscape: Qt.LandscapeOrientation

26+ property int invertedLandscape: Qt.InvertedLandscapeOrientation

27+ property int portrait: Qt.PortraitOrientation

28+ property int invertedPortrait: Qt.InvertedPortraitOrientation

29+}

qml/Components/WindowControlButtons.qml+3

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

2828 signal maximize()

2929

3030 Rectangle {

31+ objectName: "closeWindowButton"

3132 height: parent.height; width: height; radius: height / 2

3233 gradient: Gradient {

3334 GradientStop { color: "#F49073"; position: 0 }

@@ -38,6 +39,7 @@ Row {

3839 MouseArea { anchors.fill: parent; onClicked: root.close() }

3940 }

4041 Rectangle {

42+ objectName: "minimizeWindowButton"

4143 height: parent.height; width: height; radius: height / 2

4244 gradient: Gradient {

4345 GradientStop { color: "#92918C"; position: 0 }

@@ -48,6 +50,7 @@ Row {

4850 MouseArea { anchors.fill: parent; onClicked: root.minimize() }

4951 }

5052 Rectangle {

53+ objectName: "maximizeWindowButton"

5154 height: parent.height; width: height; radius: height / 2

5255 gradient: Gradient {

5356 GradientStop { color: "#92918C"; position: 0 }

qml/DeviceConfiguration.qml+84−64

@@ -16,79 +16,99 @@

1616

1717import QtQuick 2.0

1818

19−StateGroup {

19+QtObject {

2020 id: root

2121

2222 readonly property int useNativeOrientation: -1

2323

24− property int primaryOrientation: useNativeOrientation

24+ // The only writable property in the API

25+ // all other properties are set according to the device name

26+ property alias name: priv.state

2527

26− property int supportedOrientations: Qt.PortraitOrientation

27− | Qt.InvertedPortraitOrientation

28− | Qt.LandscapeOrientation

29− | Qt.InvertedLandscapeOrientation

28+ readonly property alias primaryOrientation: priv.primaryOrientation

29+ readonly property alias supportedOrientations: priv.supportedOrientations

30+ readonly property alias landscapeOrientation: priv.landscapeOrientation

31+ readonly property alias invertedLandscapeOrientation: priv.invertedLandscapeOrientation

32+ readonly property alias portraitOrientation: priv.portraitOrientation

33+ readonly property alias invertedPortraitOrientation: priv.invertedPortraitOrientation

3034

31− // Supported values so far:

32− // "phone", "tablet" or "desktop"

33− property string category: "phone"

35+ readonly property alias category: priv.category

3436

35− property int ignoredMice: 0

37+ readonly property alias ignoredMice: priv.ignoredMice

3638

39+ readonly property var priv: StateGroup {

40+ id: priv

3741

38− property alias name: root.state

42+ property int primaryOrientation: root.useNativeOrientation

3943

40− states: [

41− State {

42− name: "mako"

43− PropertyChanges {

44− target: root

45− supportedOrientations: Qt.PortraitOrientation

46− | Qt.LandscapeOrientation

47− | Qt.InvertedLandscapeOrientation

48− }

49− },

50− State {

51− name: "krillin"

52− PropertyChanges {

53− target: root

54− supportedOrientations: Qt.PortraitOrientation

55− | Qt.LandscapeOrientation

56− | Qt.InvertedLandscapeOrientation

57− }

58− },

59− State {

60− name: "arale"

61− PropertyChanges {

62− target: root

63− supportedOrientations: Qt.PortraitOrientation

64− | Qt.LandscapeOrientation

65− | Qt.InvertedLandscapeOrientation

66− ignoredMice: 1

67− }

68− },

69− State {

70− name: "manta"

71− PropertyChanges {

72− target: root

73− category: "tablet"

74− }

75− },

76− State {

77− name: "flo"

78− PropertyChanges {

79− target: root

80− primaryOrientation: Qt.InvertedLandscapeOrientation

81− category: "tablet"

82− }

83− },

84− State {

85− name: "desktop"

86− PropertyChanges {

87− target: root

88− category: "desktop"

89− supportedOrientations: root.useNativeOrientation

90− }

91− }

92− ]

44+ property int supportedOrientations: Qt.PortraitOrientation

45+ | Qt.InvertedPortraitOrientation

46+ | Qt.LandscapeOrientation

47+ | Qt.InvertedLandscapeOrientation

48+

49+ property int landscapeOrientation: Qt.LandscapeOrientation

50+ property int invertedLandscapeOrientation: Qt.InvertedLandscapeOrientation

51+ property int portraitOrientation: Qt.PortraitOrientation

52+ property int invertedPortraitOrientation: Qt.InvertedPortraitOrientation

53+

54+ // Supported values so far:

55+ // "phone", "tablet" or "desktop"

56+ property string category: "phone"

9357

58+ property int ignoredMice: 0

59+

60+ states: [

61+ State {

62+ name: "mako"

63+ PropertyChanges {

64+ target: priv

65+ supportedOrientations: Qt.PortraitOrientation

66+ | Qt.LandscapeOrientation

67+ | Qt.InvertedLandscapeOrientation

68+ }

69+ },

70+ State {

71+ name: "krillin"

72+ PropertyChanges {

73+ target: priv

74+ supportedOrientations: Qt.PortraitOrientation

75+ | Qt.LandscapeOrientation

76+ | Qt.InvertedLandscapeOrientation

77+ }

78+ },

79+ State {

80+ name: "arale"

81+ PropertyChanges {

82+ target: priv

83+ supportedOrientations: Qt.PortraitOrientation

84+ | Qt.LandscapeOrientation

85+ | Qt.InvertedLandscapeOrientation

86+ ignoredMice: 1

87+ }

88+ },

89+ State {

90+ name: "manta"

91+ PropertyChanges {

92+ target: priv

93+ category: "tablet"

94+ }

95+ },

96+ State {

97+ name: "flo"

98+ PropertyChanges {

99+ target: priv

100+ landscapeOrientation: Qt.InvertedLandscapeOrientation

101+ primaryOrientation: Qt.InvertedLandscapeOrientation

102+ category: "tablet"

103+ }

104+ },

105+ State {

106+ name: "desktop"

107+ PropertyChanges {

108+ target: priv

109+ category: "desktop"

110+ }

111+ }

112+ ]

113+ }

94114}

qml/OrientedShell.qml+31−21

@@ -32,20 +32,31 @@ Rectangle {

3232 implicitWidth: units.gu(40)

3333 implicitHeight: units.gu(71)

3434

35− // NB: native and primary orientations here don't map exactly to their QScreen counterparts

36− readonly property int nativeOrientation: width > height ? Qt.LandscapeOrientation : Qt.PortraitOrientation

37−

38− readonly property int primaryOrientation:

39− deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation

40− ? nativeOrientation : deviceConfiguration.primaryOrientation

41−

4235 DeviceConfiguration {

4336 id: deviceConfiguration

4437 name: applicationArguments.deviceName

4538 }

4639

40+ property alias orientations: d.orientations

41+

42+ Item {

43+ id: d

44+

45+ property Orientations orientations: Orientations {

46+ id: orientations

47+ // NB: native and primary orientations here don't map exactly to their QScreen counterparts

48+ native_: root.width > root.height ? Qt.LandscapeOrientation : Qt.PortraitOrientation

4749

48− // to be overwritten by tests

50+ primary: deviceConfiguration.primaryOrientation == deviceConfiguration.useNativeOrientation

51+ ? native_ : deviceConfiguration.primaryOrientation

52+

53+ landscape: deviceConfiguration.landscapeOrientation

54+ invertedLandscape: deviceConfiguration.invertedLandscapeOrientation

55+ portrait: deviceConfiguration.portraitOrientation

56+ invertedPortrait: deviceConfiguration.invertedPortraitOrientation

57+ }

58+ }

59+ // to be overwritten by tests

4960 property var unity8Settings: Unity8Settings {}

5061 property var oskSettings: GSettings { schema.id: "com.canonical.keyboard.maliit" }

5162

@@ -101,7 +112,7 @@ Rectangle {

101112

102113 property int acceptedOrientationAngle: {

103114 if (orientation & supportedOrientations) {

104− return Screen.angleBetween(nativeOrientation, orientation);

115+ return Screen.angleBetween(orientations.native_, orientation);

105116 } else if (shell.orientation & supportedOrientations) {

106117 // stay where we are

107118 return shell.orientationAngle;

@@ -111,16 +122,16 @@ Rectangle {

111122 // rotate to some supported orientation as we can't stay where we currently are

112123 // TODO: Choose the closest to the current one

113124 if (supportedOrientations & Qt.PortraitOrientation) {

114− return Screen.angleBetween(nativeOrientation, Qt.PortraitOrientation);

125+ return Screen.angleBetween(orientations.native_, Qt.PortraitOrientation);

115126 } else if (supportedOrientations & Qt.LandscapeOrientation) {

116− return Screen.angleBetween(nativeOrientation, Qt.LandscapeOrientation);

127+ return Screen.angleBetween(orientations.native_, Qt.LandscapeOrientation);

117128 } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {

118− return Screen.angleBetween(nativeOrientation, Qt.InvertedPortraitOrientation);

129+ return Screen.angleBetween(orientations.native_, Qt.InvertedPortraitOrientation);

119130 } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {

120− return Screen.angleBetween(nativeOrientation, Qt.InvertedLandscapeOrientation);

131+ return Screen.angleBetween(orientations.native_, Qt.InvertedLandscapeOrientation);

121132 } else {

122133 // if all fails, fallback to primary orientation

123− return Screen.angleBetween(nativeOrientation, primaryOrientation);

134+ return Screen.angleBetween(orientations.native_, orientations.primary);

124135 }

125136 }

126137 }

@@ -128,19 +139,19 @@ Rectangle {

128139 function angleToOrientation(angle) {

129140 switch (angle) {

130141 case 0:

131− return nativeOrientation;

142+ return orientations.native_;

132143 case 90:

133− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation

144+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedLandscapeOrientation

134145 : Qt.PortraitOrientation;

135146 case 180:

136− return nativeOrientation === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation

147+ return orientations.native_ === Qt.PortraitOrientation ? Qt.InvertedPortraitOrientation

137148 : Qt.InvertedLandscapeOrientation;

138149 case 270:

139− return nativeOrientation === Qt.PortraitOrientation ? Qt.LandscapeOrientation

150+ return orientations.native_ === Qt.PortraitOrientation ? Qt.LandscapeOrientation

140151 : Qt.InvertedPortraitOrientation;

141152 default:

142153 console.warn("angleToOrientation: Invalid orientation angle: " + angle);

143− return primaryOrientation;

154+ return orientations.primary;

144155 }

145156 }

146157

@@ -159,8 +170,7 @@ Rectangle {

159170 width: root.width

160171 height: root.height

161172 orientation: root.angleToOrientation(orientationAngle)

162− primaryOrientation: root.primaryOrientation

163− nativeOrientation: root.nativeOrientation

173+ orientations: root.orientations

164174 nativeWidth: root.width

165175 nativeHeight: root.height

166176 mode: applicationArguments.mode

qml/Panel/Panel.qml+5−3

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

2828 property alias callHint: __callHint

2929 property bool fullscreenMode: false

3030 property real indicatorAreaShowProgress: 1.0

31+ property bool locked: false

3132

3233 opacity: fullscreenMode && indicators.fullyClosed ? 0.0 : 1.0

3334

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

136137 }

137138

138139 shown: false

139− width: root.width - (PanelState.buttonsVisible ? windowControlButtons.width : 0)

140+ width: root.width - (windowControlButtons.visible ? windowControlButtons.width : 0)

140141 minimizedPanelHeight: units.gu(3)

141142 expandedPanelHeight: units.gu(7)

142143 openedHeight: root.height - indicatorOrangeLine.height

@@ -164,13 +165,14 @@ Item {

164165

165166 WindowControlButtons {

166167 id: windowControlButtons

168+ objectName: "panelWindowControlButtons"

167169 anchors {

168170 left: parent.left

169171 top: parent.top

170172 margins: units.gu(0.7)

171173 }

172174 height: indicators.minimizedPanelHeight - anchors.margins * 2

173− visible: PanelState.buttonsVisible

175+ visible: PanelState.buttonsVisible && !root.locked

174176 onClose: PanelState.close()

175177 onMinimize: PanelState.minimize()

176178 onMaximize: PanelState.maximize()

@@ -189,7 +191,7 @@ Item {

189191 id: __callHint

190192 anchors {

191193 top: parent.top

192− left: PanelState.buttonsVisible ? windowControlButtons.right : parent.left

194+ left: windowControlButtons.visible ? windowControlButtons.right : parent.left

193195 }

194196 height: indicators.minimizedPanelHeight

195197 visible: active && indicators.state == "initial"

qml/Shell.qml+7−11

@@ -48,14 +48,14 @@ Item {

4848 // to be set from outside

4949 property int orientationAngle: 0

5050 property int orientation

51− property int primaryOrientation

52− property int nativeOrientation

51+ property Orientations orientations

5352 property real nativeWidth

5453 property real nativeHeight

5554 property alias indicatorAreaShowProgress: panel.indicatorAreaShowProgress

5655 property bool beingResized

5756 property string usageScenario: "phone" // supported values: "phone", "tablet" or "desktop"

5857 property string mode: "full-greeter"

58+ property bool cursorVisible: false

5959 function updateFocusedAppOrientation() {

6060 applicationsDisplayLoader.item.updateFocusedAppOrientation();

6161 }

@@ -317,18 +317,13 @@ Item {

317317 }

318318 Binding {

319319 target: applicationsDisplayLoader.item

320− property: "background"

321− value: wallpaperResolver.background

320+ property: "orientations"

321+ value: shell.orientations

322322 }

323323 Binding {

324324 target: applicationsDisplayLoader.item

325− property: "shellPrimaryOrientation"

326− value: shell.primaryOrientation

327− }

328− Binding {

329− target: applicationsDisplayLoader.item

330− property: "nativeOrientation"

331− value: shell.nativeOrientation

325+ property: "background"

326+ value: wallpaperResolver.background

332327 }

333328 Binding {

334329 target: applicationsDisplayLoader.item

@@ -555,6 +550,7 @@ Item {

555550

556551 fullscreenMode: (topmostApplicationIsFullscreen && !lightDM.greeter.active && launcher.progress == 0)

557552 || greeter.hasLockedApp

553+ locked: greeter && greeter.active

558554 }

559555

560556 Launcher {

qml/Stages/AbstractStage.qml+2−3

@@ -15,7 +15,7 @@

1515 */

1616

1717import QtQuick 2.4

18−import Ubuntu.Components 1.2

18+import Ubuntu.Components 1.3

1919import GSettings 1.0

2020

2121Rectangle {

@@ -33,11 +33,10 @@ Rectangle {

3333 property bool keepDashRunning: true

3434 property real maximizedAppTopMargin

3535 property real nativeHeight

36− property int nativeOrientation

3736 property real nativeWidth

37+ property QtObject orientations

3838 property int shellOrientation

3939 property int shellOrientationAngle

40− property int shellPrimaryOrientation

4140 property bool spreadEnabled: true // If false, animations and right edge will be disabled

4241 property bool suspended

4342

qml/Stages/DesktopStage.qml+10−3

@@ -22,6 +22,7 @@ import Ubuntu.Components 1.1

2222import Unity.Application 0.1

2323import "../Components"

2424import "../Components/PanelState"

25+import "../Components"

2526import Utils 0.1

2627import Ubuntu.Gestures 0.1

2728

@@ -92,6 +93,7 @@ AbstractStage {

9293 property: "buttonsVisible"

9394 value: priv.focusedAppDelegate !== null && priv.focusedAppDelegate.state === "maximized"

9495 }

96+ Component.onDestruction: PanelState.buttonsVisible = false;

9597

9698 FocusScope {

9799 id: appContainer

@@ -122,6 +124,7 @@ AbstractStage {

122124

123125 property bool maximized: false

124126 property bool minimized: false

127+ property bool animationsEnabled: true

125128

126129 onFocusChanged: {

127130 if (focus && ApplicationManager.focusedApplicationId !== model.appId) {

@@ -140,15 +143,18 @@ AbstractStage {

140143 value: ApplicationInfoInterface.RequestedRunning // Always running for now

141144 }

142145

143− function maximize() {

146+ function maximize(animated) {

147+ animationsEnabled = (animated === undefined) || animated;

144148 minimized = false;

145149 maximized = true;

146150 }

147− function minimize() {

151+ function minimize(animated) {

152+ animationsEnabled = (animated === undefined) || animated;

148153 maximized = false;

149154 minimized = true;

150155 }

151− function unmaximize() {

156+ function unmaximize(animated) {

157+ animationsEnabled = (animated === undefined) || animated;

152158 minimized = false;

153159 maximized = false;

154160 }

@@ -170,6 +176,7 @@ AbstractStage {

170176 Transition {

171177 from: "maximized,minimized,normal,"

172178 to: "maximized,minimized,normal,"

179+ enabled: appDelegate.animationsEnabled

173180 PropertyAnimation { target: appDelegate; properties: "x,y,opacity,width,height,scale" }

174181 },

175182 Transition {

qml/Stages/PhoneStage.qml+3−4

@@ -30,6 +30,7 @@ AbstractStage {

3030 property bool altTabEnabled: true

3131 property real startScale: 1.1

3232 property real endScale: 0.7

33+

3334 onBeingResizedChanged: {

3435 if (beingResized) {

3536 // Brace yourselves for impact!

@@ -58,7 +59,7 @@ AbstractStage {

5859

5960 var supportedOrientations = spreadDelegate.application.supportedOrientations;

6061 if (supportedOrientations === Qt.PrimaryOrientation) {

61− supportedOrientations = spreadDelegate.shellPrimaryOrientation;

62+ supportedOrientations = root.orientations.primary;

6263 }

6364

6465 if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {

@@ -523,11 +524,9 @@ AbstractStage {

523524 visible: (progress >= 0 && progress < 1.7)

524525 || (isDash && priv.focusedAppDelegateIsDislocated)

525526

526−

527527 shellOrientationAngle: root.shellOrientationAngle

528528 shellOrientation: root.shellOrientation

529− shellPrimaryOrientation: root.shellPrimaryOrientation

530− nativeOrientation: root.nativeOrientation

529+ orientations: root.orientations

531530

532531 onClicked: {

533532 if (root.altTabEnabled && spreadView.phase == 2) {

qml/Stages/SpreadDelegate.qml+8−9

@@ -42,8 +42,7 @@ FocusScope {

4242 property alias application: appWindow.application

4343 property int shellOrientationAngle

4444 property int shellOrientation

45− property int shellPrimaryOrientation

46− property int nativeOrientation

45+ property QtObject orientations

4746

4847 function matchShellOrientation() {

4948 if (!root.application)

@@ -157,7 +156,7 @@ FocusScope {

157156 var supportedOrientations = root.application.supportedOrientations;

158157

159158 if (supportedOrientations === Qt.PrimaryOrientation) {

160− supportedOrientations = root.shellPrimaryOrientation;

159+ supportedOrientations = root.orientations.primary;

161160 }

162161

163162 // If it doesn't support shell's current orientation

@@ -166,18 +165,18 @@ FocusScope {

166165 if (supportedOrientations & root.shellOrientation) {

167166 chosenOrientation = root.shellOrientation;

168167 } else if (supportedOrientations & Qt.PortraitOrientation) {

169− chosenOrientation = Qt.PortraitOrientation;

168+ chosenOrientation = root.orientations.portrait;

170169 } else if (supportedOrientations & Qt.LandscapeOrientation) {

171− chosenOrientation = Qt.LandscapeOrientation;

170+ chosenOrientation = root.orientations.landscape;

172171 } else if (supportedOrientations & Qt.InvertedPortraitOrientation) {

173− chosenOrientation = Qt.InvertedPortraitOrientation;

172+ chosenOrientation = root.orientations.invertedPortrait;

174173 } else if (supportedOrientations & Qt.InvertedLandscapeOrientation) {

175− chosenOrientation = Qt.InvertedLandscapeOrientation;

174+ chosenOrientation = root.orientations.invertedLandscape;

176175 } else {

177− chosenOrientation = root.shellPrimaryOrientation;

176+ chosenOrientation = root.orientations.primary;

178177 }

179178

180− return Screen.angleBetween(root.nativeOrientation, chosenOrientation);

179+ return Screen.angleBetween(root.orientations.native_, chosenOrientation);

181180 }

182181

183182 rotation: normalizeAngle(appWindowWithShadow.orientationAngle - root.shellOrientationAngle)

qml/Stages/TabletStage.qml+10−5

@@ -47,7 +47,7 @@ AbstractStage {

4747

4848 var supportedOrientations = spreadDelegate.application.supportedOrientations;

4949 if (supportedOrientations === Qt.PrimaryOrientation) {

50− supportedOrientations = spreadDelegate.shellPrimaryOrientation;

50+ supportedOrientations = spreadDelegate.orientations.primary;

5151 }

5252

5353 if (delta === 180 && (supportedOrientations & spreadDelegate.shellOrientation)) {

@@ -110,7 +110,7 @@ AbstractStage {

110110 property string oldFocusedAppId: ""

111111 property bool mainAppOrientationChangesEnabled: false

112112

113− property real landscapeHeight: root.nativeOrientation == Qt.LandscapeOrientation ?

113+ property real landscapeHeight: root.orientations.native_ == Qt.LandscapeOrientation ?

114114 root.nativeHeight : root.nativeWidth

115115

116116 property bool shellIsLandscape: root.shellOrientation === Qt.LandscapeOrientation

@@ -674,9 +674,14 @@ AbstractStage {

674674

675675 shellOrientationAngle: wantsMainStage ? root.shellOrientationAngle : 0

676676 shellOrientation: wantsMainStage ? root.shellOrientation : Qt.PortraitOrientation

677− shellPrimaryOrientation: wantsMainStage ? root.shellPrimaryOrientation : Qt.PortraitOrientation

678− nativeOrientation: wantsMainStage ? root.nativeOrientation : Qt.PortraitOrientation

679−

677+ orientations: Orientations {

678+ primary: spreadTile.wantsMainStage ? root.orientations.primary : Qt.PortraitOrientation

679+ native_: spreadTile.wantsMainStage ? root.orientations.native_ : Qt.PortraitOrientation

680+ portrait: root.orientations.portrait

681+ invertedPortrait: root.orientations.invertedPortrait

682+ landscape: root.orientations.landscape

683+ invertedLandscape: root.orientations.invertedLandscape

684+ }

680685

681686 onClicked: {

682687 if (spreadView.phase == 2) {

qml/Stages/WindowResizeArea.qml+38−7

@@ -36,18 +36,49 @@ MouseArea {

3636 property int minWidth: 0

3737 property int minHeight: 0

3838

39+ QtObject {

40+ id: priv

41+

42+ property int normalX: 0

43+ property int normalY: 0

44+ property int normalWidth: 0

45+ property int normalHeight: 0

46+

47+ function updateNormalGeometry() {

48+ if (root.target.state == "normal") {

49+ normalX = root.target.x

50+ normalY = root.target.y

51+ normalWidth = root.target.width

52+ normalHeight = root.target.height

53+ }

54+ }

55+ }

56+

57+ Connections {

58+ target: root.target

59+ onXChanged: priv.updateNormalGeometry();

60+ onYChanged: priv.updateNormalGeometry();

61+ onWidthChanged: priv.updateNormalGeometry();

62+ onHeightChanged: priv.updateNormalGeometry();

63+ }

64+

3965 Component.onCompleted: {

40− var windowState = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))

41− if (windowState !== undefined) {

42− target.x = windowState.x

43− target.y = windowState.y

44− target.width = windowState.width

45− target.height = windowState.height

66+ var windowGeometry = windowStateStorage.getGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))

67+ if (windowGeometry !== undefined) {

68+ target.x = windowGeometry.x

69+ target.y = windowGeometry.y

70+ target.width = windowGeometry.width

71+ target.height = windowGeometry.height

72+ }

73+ var windowState = windowStateStorage.getState(root.windowId, WindowStateStorage.WindowStateNormal)

74+ if (windowState === WindowStateStorage.WindowStateMaximized) {

75+ target.maximize(false)

4676 }

4777 }

4878

4979 Component.onDestruction: {

50− windowStateStorage.saveGeometry(root.windowId, Qt.rect(target.x, target.y, target.width, target.height))

80+ windowStateStorage.saveState(root.windowId, target.state == "maximized" ? WindowStateStorage.WindowStateMaximized : WindowStateStorage.WindowStateNormal)

81+ windowStateStorage.saveGeometry(root.windowId, Qt.rect(priv.normalX, priv.normalY, priv.normalWidth, priv.normalHeight))

5182 }

5283

5384 QtObject {

tests/mocks/Utils/windowstatestorage.cpp+17

@@ -44,3 +44,20 @@ QRect WindowStateStorage::getGeometry(const QString &windowId, const QRect &defa

4444 if (!m_geometry.contains(windowId)) return defaultValue;

4545 return m_geometry.value(windowId).toRect();

4646}

47+

48+void WindowStateStorage::clear()

49+{

50+ m_state.clear();

51+ m_geometry.clear();

52+}

53+

54+void WindowStateStorage::saveState(const QString &windowId, WindowState state)

55+{

56+ m_state[windowId] = state;

57+}

58+

59+WindowStateStorage::WindowState WindowStateStorage::getState(const QString &windowId, WindowStateStorage::WindowState defaultValue)

60+{

61+ if (!m_state.contains(windowId)) return defaultValue;

62+ return m_state.value(windowId);

63+}

tests/mocks/Utils/windowstatestorage.h+12

@@ -22,12 +22,23 @@ class WindowStateStorage: public QObject

2222{

2323 Q_OBJECT

2424 Q_PROPERTY(QVariantMap geometry READ geometry WRITE setGeometry NOTIFY geometryChanged)

25+ Q_ENUMS(WindowState)

2526public:

27+ enum WindowState {

28+ WindowStateNormal,

29+ WindowStateMaximized

30+ };

2631 WindowStateStorage(QObject *parent = 0);

2732

33+ Q_INVOKABLE void saveState(const QString &windowId, WindowState state);

34+ Q_INVOKABLE WindowState getState(const QString &windowId, WindowState defaultValue);

35+

2836 Q_INVOKABLE void saveGeometry(const QString &windowId, const QRect &rect);

2937 Q_INVOKABLE QRect getGeometry(const QString &windowId, const QRect &defaultValue);

3038

39+ // Only in the mock, to easily restore a fresh state

40+ Q_INVOKABLE void clear();

41+

3142Q_SIGNALS:

3243 void geometryChanged(const QVariantMap& geometry);

3344

@@ -35,5 +46,6 @@ private:

3546 void setGeometry(const QVariantMap& geometry);

3647 QVariantMap geometry() const;

3748

49+ QHash<QString, WindowState> m_state;

3850 QVariantMap m_geometry;

3951};

tests/qmltests/Stages/tst_PhoneStage.qml−2

@@ -34,8 +34,6 @@ Item {

3434 maximizedAppTopMargin: units.gu(3) + units.dp(2)

3535 interactive: true

3636 shellOrientation: Qt.PortraitOrientation

37− shellPrimaryOrientation: Qt.PortraitOrientation

38− nativeOrientation: Qt.PortraitOrientation

3937 }

4038

4139 Binding {

tests/qmltests/Stages/tst_SpreadDelegate.qml+6−2

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

1818import QtTest 1.0

1919import Unity.Test 0.1 as UT

2020import ".."

21+import "../../../qml/Components"

2122import "../../../qml/Stages"

2223import Ubuntu.Components 0.1

2324import Ubuntu.Components.ListItems 1.0 as ListItem

@@ -73,8 +74,11 @@ Rectangle {

7374 return Qt.LandscapeOrientation;

7475 }

7576 }

76− shellPrimaryOrientation: Qt.PortraitOrientation

77− nativeOrientation: Qt.PortraitOrientation

77+

78+ orientations: Orientations {

79+ // the default values will do

80+ }

81+

7882 maximizedAppTopMargin: units.gu(3)

7983 Component.onDestruction: {

8084 spreadDelegateLoader.itemDestroyed = true;

tests/qmltests/Stages/tst_TabletStage.qml+2−2

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

2222import Unity.Test 0.1

2323

2424import "../../../qml/Stages"

25+import "../../../qml/Components"

2526

2627Rectangle {

2728 id: root

@@ -50,10 +51,9 @@ Rectangle {

5051 maximizedAppTopMargin: units.gu(3) + units.dp(2)

5152 interactive: true

5253 shellOrientation: Qt.LandscapeOrientation

53− shellPrimaryOrientation: Qt.LandscapeOrientation

54− nativeOrientation: Qt.LandscapeOrientation

5554 nativeWidth: width

5655 nativeHeight: height

56+ orientations: Orientations{} // Defaults are fine for testing

5757 focus: true

5858 }

5959 }

tests/qmltests/Stages/tst_WindowResizeArea.qml+35−2

@@ -44,8 +44,11 @@ Item {

4444 width: units.gu(20)

4545 property int windowHeight: height

4646 property int windowWidth: width

47− onWindowHeightChanged: height = windowHeight

48− onWindowWidthChanged: width = windowWidth

47+ state: "normal"

48+

49+ function maximize() {

50+ state = "maximized"

51+ }

4952

5053 WindowResizeArea {

5154 id: windowResizeArea

@@ -195,5 +198,35 @@ Item {

195198 tryCompare(fakeWindow, "width", initialWindowWidth);

196199 tryCompare(fakeWindow, "height", initialWindowHeight);

197200 }

201+

202+ function test_saveRestoreMaximized() {

203+ var initialWindowX = fakeWindow.x;

204+ var initialWindowY = fakeWindow.y;

205+

206+ var moveDelta = units.gu(5);

207+

208+ fakeWindow.x = initialWindowX + moveDelta

209+ fakeWindow.y = initialWindowY + moveDelta

210+

211+ // Now change the state to maximized. The window should not keep updating the stored values

212+ fakeWindow.state = "maximized"

213+ fakeWindow.x = 31415 // 0 is too risky to pass the test even when broken

214+ fakeWindow.y = 31415

215+

216+ // This will destroy the window and recreate it

217+ windowLoader.active = false;

218+ waitForRendering(root);

219+ windowLoader.active = true;

220+

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

222+ tryCompare(fakeWindow, "x", initialWindowX + moveDelta)

223+ tryCompare(fakeWindow, "y", initialWindowX + moveDelta)

224+

225+ // Make sure maximize() has been called after restoring

226+ tryCompare(fakeWindow, "state", "maximized")

227+

228+ // clean up

229+ fakeWindow.state = "normal"

230+ }

198231 }

199232}

tests/qmltests/tst_OrientedShell.qml+1−1

@@ -840,7 +840,7 @@ Rectangle {

840840 // shell should remain in its primery orientation as the app in the main stage

841841 // is the one that dictates its orientation. In this case it's unity8-dash

842842 // which supports only primary orientation

843− compare(shell.orientation, orientedShell.primaryOrientation);

843+ compare(shell.orientation, orientedShell.orientations.primary);

844844 }

845845

846846 function test_sideStageAppsRemainPortraitInSpread_data() {

tests/qmltests/tst_Shell.qml+75−2

@@ -29,8 +29,11 @@ import Unity.Notifications 1.0

2929import Unity.Test 0.1

3030import Powerd 0.1

3131import Wizard 0.1 as Wizard

32+import Utils 0.1

3233

3334import "../../qml"

35+import "../../qml/Components"

36+import "../../qml/Components/PanelState"

3437import "Stages"

3538

3639Rectangle {

@@ -97,8 +100,7 @@ Rectangle {

97100 id: __shell

98101 usageScenario: usageScenarioSelector.model[usageScenarioSelector.selectedIndex]

99102 orientation: Qt.PortraitOrientation

100− primaryOrientation: Qt.PortraitOrientation

101− nativeOrientation: Qt.PortraitOrientation

103+ orientations: Orientations{} // Defaults are fine for testing

102104 Component.onDestruction: {

103105 shellLoader.itemDestroyed = true;

104106 }

@@ -302,6 +304,7 @@ Rectangle {

302304 mouseEmulation.checked = true;

303305 tryCompare(shell, "enabled", true); // make sure greeter didn't leave us in disabled state

304306 tearDown();

307+ WindowStateStorage.clear();

305308 }

306309

307310 function loadShell(formFactor) {

@@ -1710,6 +1713,76 @@ Rectangle {

17101713 keyRelease(Qt.Key_Control);

17111714 }

17121715

1716+ // regression test for http://pad.lv/1443319

1717+ function test_closeMaximizedAndRestart() {

1718+ loadDesktopShellWithApps();

1719+

1720+ var appRepeater = findChild(shell, "appRepeater")

1721+ var appId = ApplicationManager.get(0).appId;

1722+ var appDelegate = appRepeater.itemAt(0);

1723+ var maximizeButton = findChild(appDelegate, "maximizeWindowButton");

1724+

1725+ wait(5000)

1726+ tryCompare(appDelegate, "state", "normal");

1727+ tryCompare(PanelState, "buttonsVisible", false)

1728+

1729+ wait(5000)

1730+ mouseClick(maximizeButton, maximizeButton.width / 2, maximizeButton.height / 2);

1731+ tryCompare(appDelegate, "state", "maximized");

1732+ tryCompare(PanelState, "buttonsVisible", true)

1733+

1734+ ApplicationManager.stopApplication(appId);

1735+ tryCompare(PanelState, "buttonsVisible", false)

1736+

1737+ ApplicationManager.startApplication(appId);

1738+ tryCompare(PanelState, "buttonsVisible", true)

1739+ }

1740+

1741+ // bug http://pad.lv/1431566

1742+ function test_switchToStagedHidesPanelButtons() {

1743+ loadDesktopShellWithApps();

1744+ var appRepeater = findChild(shell, "appRepeater")

1745+ var appId = ApplicationManager.get(0).appId;

1746+ var appDelegate = appRepeater.itemAt(0);

1747+ var panelButtons = findChild(shell, "panelWindowControlButtons")

1748+

1749+ tryCompare(appDelegate, "state", "normal");

1750+ tryCompare(panelButtons, "visible", false);

1751+

1752+ appDelegate.maximize(false);

1753+ tryCompare(panelButtons, "visible", true);

1754+

1755+ shell.usageScenario = "phone";

1756+ waitForRendering(shell);

1757+ tryCompare(panelButtons, "visible", false);

1758+

1759+ shell.usageScenario = "desktop";

1760+ waitForRendering(shell);

1761+ tryCompare(panelButtons, "visible", true);

1762+ }

1763+

1764+ function test_lockingGreeterHidesPanelButtons() {

1765+ loadDesktopShellWithApps();

1766+ var appRepeater = findChild(shell, "appRepeater")

1767+ var appId = ApplicationManager.get(0).appId;

1768+ var appDelegate = appRepeater.itemAt(0);

1769+ var panelButtons = findChild(shell, "panelWindowControlButtons")

1770+

1771+ tryCompare(appDelegate, "state", "normal");

1772+ tryCompare(panelButtons, "visible", false);

1773+

1774+ appDelegate.maximize(false);

1775+ tryCompare(panelButtons, "visible", true);

1776+

1777+ LightDM.Greeter.showGreeter();

1778+ waitForRendering(shell);

1779+ tryCompare(panelButtons, "visible", false);

1780+

1781+ LightDM.Greeter.hideGreeter();

1782+ waitForRendering(shell);

1783+ tryCompare(panelButtons, "visible", true);

1784+ }

1785+

17131786 function test_lifecyclePolicy_data() {

17141787 return [

17151788 {tag: "phone", formFactor: "phone", usageScenario: "phone", suspendsApps: true},