Unity 8

Merge lp:~unity-team/unity8/stagedFullscreen.form-factor into lp:unity8

stagedFullscreen.form-factor
Merge into trunk

Proposed by Michał Sawicz on 2016-02-04

Status:	Work in progress
Proposed branch:	lp:~unity-team/unity8/stagedFullscreen.form-factor
Merge into:	lp:unity8
Diff against target:	348 lines (+158/-10) 9 files modified qml/Stages/AbstractStage.qml (+15/-0) qml/Stages/DesktopStage.qml (+41/-9) qml/Stages/PhoneStage.qml (+2/-0) qml/Stages/TabletStage.qml (+2/-0) tests/mocks/Unity/Screens/ScreenWindow.qml (+24/-0) tests/mocks/Unity/Screens/Screens.qmltypes (+57/-0) tests/mocks/Unity/Screens/plugin.cpp (+2/-1) tests/mocks/Unity/Screens/qmldir (+3/-0) tests/mocks/Unity/Screens/screens.h (+12/-0)
To merge this branch:	bzr merge lp:~unity-team/unity8/stagedFullscreen.form-factor
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-03-24
Albert Astals Cid (community)			Needs Fixing on 2016-02-22
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-10
Michał Sawicz	code		Approve on 2016-02-05
Michael Zanetti (community)		2016-02-04	Needs Information on 2016-02-04
Review via email: mp+285053@code.launchpad.net

Commit message

Set form factor on all screens

Description of the change

* Are there any related MPs required for this MP to build/function as expected? Please list.
lp:~nick-dedekind/qtmir/stagedFullscreen.form-factor

* Did you perform an exploratory manual test run of your code change and any related functionality?
Will do in silo

* Did you make sure that your branch does not contain spurious tags?
Y

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

* If you changed the UI, has there been a design review?
Will be in silo

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-04:

FAILED: Continuous integration, rev:2174
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/273/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/273/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7215/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-02-04:

I don't think having the repeater in the AbstractStage is the right thing to do. For example, in the case of an external display, we'd have 2 screens, however, the Stage would run only on one of them. Still it sets both screens to FormFactorMonitor.

I guess the current circumstances still make it work for all the cases we support atm, but it really doesn't look like this is gonna be future proof like this.

Do I understand something wrong?

review: Needs Information

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2016-02-04:

> I don't think having the repeater in the AbstractStage is the right thing to
> do. For example, in the case of an external display, we'd have 2 screens,
> however, the Stage would run only on one of them. Still it sets both screens
> to FormFactorMonitor.
>
> I guess the current circumstances still make it work for all the cases we
> support atm, but it really doesn't look like this is gonna be future proof
> like this.
>
> Do I understand something wrong?

This is a temporary solution. we have an idea for the final thing; but it's a wip at the moment.

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2016-02-04:

So, given this is quite temporary, and we don't have a chance to come up with the proper things at this point, I'd suggest to move the repeater into Shell.qml and determine the form factor from Shell.useScenario. That way we only have to add temporary code (and please add a FIXME comment) to 1 place instead of distributing it over 4 files.

If the screens api allows us to do so, try setting the form factor only to the screen in use, instead of all screens. If not, don't bother, this will do for now.

lp:~unity-team/unity8/stagedFullscreen.form-factor updated on 2016-02-04

2175. By Nick Dedekind on 2016-02-04: added FIXME

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-04:

FAILED: Continuous integration, rev:2175
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/280/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/280/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-04:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7222/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Nick Dedekind (nick-dedekind) wrote on 2016-02-04:

> So, given this is quite temporary, and we don't have a chance to come up with
> the proper things at this point, I'd suggest to move the repeater into
> Shell.qml and determine the form factor from Shell.useScenario. That way we
> only have to add temporary code (and please add a FIXME comment) to 1 place
> instead of distributing it over 4 files.
>
> If the screens api allows us to do so, try setting the form factor only to the
> screen in use, instead of all screens. If not, don't bother, this will do for
> now.

I've added a fixme. I still believe it's up to the stage to decide which form factor it uses.

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-02-05:

* Did you perform an exploratory manual test run of the code change and any related functionality?
Y
* Did CI run pass? If not, please explain why.
One test fixed elsewhere
* Did you make sure that the branch does not contain spurious tags?
Y

review: Approve (code)

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-05:

FAILED: Continuous integration, rev:2175
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/284/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/284/rebuild

review: Needs Fixing (continuous-integration)

lp:~unity-team/unity8/stagedFullscreen.form-factor updated on 2016-02-10

2176. By Nick Dedekind on 2016-02-05: Fixed requestedHeight/Width

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-10:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/305/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-10:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7246/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2016-02-22:

Text conflict in qml/Stages/DesktopStage.qml
1 conflicts encountered.

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-03-24:

FAILED: Continuous integration, rev:2176
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/840/
Executed test runs:
FAILURE: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1086/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/840/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-03-24:

Text conflict in qml/Stages/DesktopStage.qml
Text conflict in qml/Stages/TabletStage.qml
2 conflicts encountered.

Unmerged revisions

2176. By Nick Dedekind on 2016-02-05: Fixed requestedHeight/Width
2175. By Nick Dedekind on 2016-02-04: added FIXME
2174. By Nick Dedekind on 2016-02-04: Set screen form factor
2173. By Nick Dedekind on 2016-02-04: Add FormFactor to Unity.Screens mock

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Mohammad Rakibul Hasan

Unity Team

 === modified file 'qml/Stages/AbstractStage.qml'
 --- qml/Stages/AbstractStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/AbstractStage.qml	2016-02-10 11:16:44 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
  import GSettings 1.0
++import Unity.Screens 0.1
  Rectangle {
      id: root
@@ -48,6 +49,7 @@
                                        | Qt.LandscapeOrientation
                                        | Qt.InvertedPortraitOrientation
                                        | Qt.InvertedLandscapeOrientation
++    property var formFactor
      // Shared code for use in stage implementations
      GSettings {
@@ -64,4 +66,17 @@
+         }
          return false;
+     }
++
++    // FIXME - Form factor should be a per screen decision and handled by the window.
++    Repeater {
++        model: Screens {}
++        Item {
++            Binding {
++                target: model
++                when: model.formFactor != Screens.FormFactorUnknown && root.formFactor !== undefined
++                property: "formFactor"
++                value: root.formFactor
++            }
++        }
++    }
+ }
 === modified file 'qml/Stages/DesktopStage.qml'
 --- qml/Stages/DesktopStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/DesktopStage.qml	2016-02-10 11:16:44 +0000
@@ -17,6 +17,7 @@
  import QtQuick 2.4
  import Ubuntu.Components 1.3
  import Unity.Application 0.1
++import Unity.Screens 0.1
  import "../Components/PanelState"
  import "../Components"
  import Utils 0.1
@@ -39,6 +40,7 @@
      mainApp: ApplicationManager.focusedApplicationId
              ? ApplicationManager.findApplication(ApplicationManager.focusedApplicationId)
              : null
++    formFactor: Screens.FormFactorMonitor
      // application windows never rotate independently
      mainAppWindowOrientationAngle: shellOrientationAngle
@@ -254,8 +256,8 @@
                  focus: appId === priv.focusedAppId
                  width: decoratedWindow.width
                  height: decoratedWindow.height
--                property alias requestedWidth: decoratedWindow.requestedWidth
--                property alias requestedHeight: decoratedWindow.requestedHeight
++                property int requestedWidth: -1
++                property int requestedHeight: -1
                  QtObject {
                      id: appDelegatePrivate
@@ -366,20 +368,40 @@
                          PropertyChanges {
                              target: appDelegate;
                              x: 0; y: 0;
--                            requestedWidth: root.width; requestedHeight: root.height;
                              visuallyMinimized: false;
                              visuallyMaximized: true
+                         }
++                        PropertyChanges {
++                            target: decoratedWindow
++                            requestedWidth: root.width;
++                            requestedHeight: root.height;
++                        }
                      },
                      State {
                          name: "maximizedLeft"; when: appDelegate.maximizedLeft && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: 0; y: PanelState.panelHeight;
--                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
++                        PropertyChanges {
++                            target: appDelegate;
++                            x: 0;
++                            y: PanelState.panelHeight;
++                        }
++                        PropertyChanges {
++                            target: decoratedWindow
++                            requestedWidth: root.width/2
++                            requestedHeight: root.height - PanelState.panelHeight
++                        }
                      },
                      State {
                          name: "maximizedRight"; when: appDelegate.maximizedRight && !appDelegate.minimized
--                        PropertyChanges { target: appDelegate; x: root.width/2; y: PanelState.panelHeight;
--                            requestedWidth: root.width/2; requestedHeight: root.height - PanelState.panelHeight }
++                        PropertyChanges {
++                            target: appDelegate;
++                            x: root.width/2;
++                            y: PanelState.panelHeight
++                        }
++                        PropertyChanges {
++                            target: decoratedWindow
++                            requestedWidth: root.width/2;
++                            requestedHeight: root.height - PanelState.panelHeight
++                        }
                      },
                      State {
                          name: "minimized"; when: appDelegate.minimized
@@ -399,13 +421,17 @@
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; properties: "visuallyMinimized,visuallyMaximized" }
                          UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                        UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
                      },
                      Transition {
                          to: "minimized"
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMaximized" }
                          SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                            ParallelAnimation {
++                                UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale"; duration: UbuntuAnimation.FastDuration }
++                                UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
++                            }
                              PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                              ScriptAction {
                                  script: {
@@ -421,7 +447,10 @@
                          enabled: appDelegate.animationsEnabled
                          PropertyAction { target: appDelegate; property: "visuallyMinimized" }
                          SequentialAnimation {
--                            UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,requestedWidth,requestedHeight,scale"; duration: UbuntuAnimation.FastDuration }
++                            ParallelAnimation {
++                                UbuntuNumberAnimation { target: appDelegate; properties: "x,y,opacity,scale"; duration: UbuntuAnimation.FastDuration }
++                                UbuntuNumberAnimation { target: decoratedWindow; properties: "requestedWidth,requestedHeight"; duration: UbuntuAnimation.FastDuration }
++                            }
                              PropertyAction { target: appDelegate; property: "visuallyMaximized" }
+                         }
+                     }
@@ -457,6 +486,9 @@
                      active: ApplicationManager.focusedApplicationId === model.appId
                      focus: true
++                    requestedWidth: appDelegate.requestedWidth
++                    requestedHeight: appDelegate.requestedHeight
++
                      onClose: ApplicationManager.stopApplication(model.appId)
                      onMaximize: appDelegate.maximized || appDelegate.maximizedLeft || appDelegate.maximizedRight
                                  ? appDelegate.restoreFromMaximized() : appDelegate.maximize()
 === modified file 'qml/Stages/PhoneStage.qml'
 --- qml/Stages/PhoneStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/PhoneStage.qml	2016-02-10 11:16:44 +0000
@@ -18,6 +18,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Application 0.1
++import Unity.Screens 0.1
  import Unity.Session 0.1
  import Utils 0.1
  import Powerd 0.1
@@ -77,6 +78,7 @@
      mainApp: applicationManager.focusedApplicationId
              ? applicationManager.findApplication(applicationManager.focusedApplicationId)
              : null
++    formFactor: Screens.FormFactorPhone
      orientationChangesEnabled: priv.focusedAppOrientationChangesEnabled
                                 && !priv.focusedAppDelegateIsDislocated
 === modified file 'qml/Stages/TabletStage.qml'
 --- qml/Stages/TabletStage.qml	2016-01-14 13:03:20 +0000
 +++ qml/Stages/TabletStage.qml	2016-02-10 11:16:44 +0000
@@ -18,6 +18,7 @@
  import Ubuntu.Components 1.3
  import Ubuntu.Gestures 0.1
  import Unity.Application 0.1
++import Unity.Screens 0.1
  import Utils 0.1
  import Powerd 0.1
  import "../Components"
@@ -70,6 +71,7 @@
+         }
+     }
++    formFactor: Screens.FormFactorTablet
      orientationChangesEnabled: priv.mainAppOrientationChangesEnabled
      supportedOrientations: mainApp ? mainApp.supportedOrientations
 === added file 'tests/mocks/Unity/Screens/ScreenWindow.qml'
 --- tests/mocks/Unity/Screens/ScreenWindow.qml	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Screens/ScreenWindow.qml	2016-02-10 11:16:44 +0000
@@ -0,0 +1,24 @@
++/*
++ * Copyright (C) 2016 Canonical, Ltd.
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; version 3.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ */
++
++import QtQuick 2.4
++import Unity.Screens 0.1
++
++Rectangle {
++    property var screens: 1
++    property real scale: 1.0
++    property int formFactor: Screens.FormFactorMonitor
++}
 === added file 'tests/mocks/Unity/Screens/Screens.qmltypes'
 --- tests/mocks/Unity/Screens/Screens.qmltypes	1970-01-01 00:00:00 +0000
 +++ tests/mocks/Unity/Screens/Screens.qmltypes	2016-02-10 11:16:44 +0000
@@ -0,0 +1,57 @@
++import QtQuick.tooling 1.2
++
++// This file describes the plugin-supplied types contained in the library.
++// It is used for QML tooling purposes only.
++//
++// This file was auto-generated by:
++// 'qmlplugindump -notrelocatable Unity.Screens 0.1 tests/mocks'
++
++Module {
++    dependencies: ["QtQuick 2.4"]
++    Component {
++        name: "Screens"
++        prototype: "QAbstractListModel"
++        exports: ["Unity.Screens/Screens 0.1"]
++        exportMetaObjectRevisions: [0]
++        Enum {
++            name: "OutputTypes"
++            values: {
++                "Unknown": 0,
++                "VGA": 1,
++                "DVII": 2,
++                "DVID": 3,
++                "DVIA": 4,
++                "Composite": 5,
++                "SVideo": 6,
++                "LVDS": 7,
++                "Component": 8,
++                "NinePinDIN": 9,
++                "DisplayPort": 10,
++                "HDMIA": 11,
++                "HDMIB": 12,
++                "TV": 13,
++                "EDP": 14
++            }
++        }
++        Enum {
++            name: "FormFactor"
++            values: {
++                "FormFactorUnknown": 0,
++                "FormFactorPhone": 1,
++                "FormFactorTablet": 2,
++                "FormFactorMonitor": 3,
++                "FormFactorTV": 4,
++                "FormFactorProjector": 5
++            }
++        }
++        Property { name: "count"; type: "int"; isReadonly: true }
++        Signal {
++            name: "screenAdded"
++            Parameter { name: "screen"; type: "QScreen"; isPointer: true }
++        }
++        Signal {
++            name: "screenRemoved"
++            Parameter { name: "screen"; type: "QScreen"; isPointer: true }
++        }
++    }
++}
 === modified file 'tests/mocks/Unity/Screens/plugin.cpp'
 --- tests/mocks/Unity/Screens/plugin.cpp	2015-12-02 13:23:45 +0000
 +++ tests/mocks/Unity/Screens/plugin.cpp	2016-02-10 11:16:44 +0000
@@ -1,5 +1,5 @@
  /*
-- * Copyright (C) 2015 Canonical, Ltd.
++ * Copyright (C) 2016 Canonical, Ltd.
+  *
   * This program is free software: you can redistribute it and/or modify it under
   * the terms of the GNU Lesser General Public License version 3, as published by
@@ -26,4 +26,5 @@
      qRegisterMetaType<QScreen*>("QScreen*");
      qmlRegisterType<Screens>(uri, 0, 1, "Screens");
++    qRegisterMetaType<Screens::FormFactor>("Screens::FormFactor");
+ }
 === modified file 'tests/mocks/Unity/Screens/qmldir'
 --- tests/mocks/Unity/Screens/qmldir	2015-12-02 13:23:45 +0000
 +++ tests/mocks/Unity/Screens/qmldir	2016-02-10 11:16:44 +0000
@@ -1,2 +1,5 @@
  module Unity.Screens
  plugin MockScreensPlugin
++typeinfo Screens.qmltypes
++
++ScreenWindow 0.1 ScreenWindow.qml
 === modified file 'tests/mocks/Unity/Screens/screens.h'
 --- tests/mocks/Unity/Screens/screens.h	2015-12-03 11:45:52 +0000
 +++ tests/mocks/Unity/Screens/screens.h	2016-02-10 11:16:44 +0000
@@ -26,6 +26,7 @@
+ {
      Q_OBJECT
      Q_ENUMS(OutputTypes)
++    Q_ENUMS(FormFactor)
      Q_PROPERTY(int count READ count NOTIFY countChanged)
@@ -53,6 +54,15 @@
          EDP
      };
++    enum FormFactor {
++        FormFactorUnknown,
++        FormFactorPhone,
++        FormFactorTablet,
++        FormFactorMonitor,
++        FormFactorTV,
++        FormFactorProjector,
++    };
++
      explicit Screens(QObject *parent = 0);
      virtual ~Screens() noexcept;
@@ -79,4 +89,6 @@
      QScreen *qScreen = nullptr;
  };
++Q_DECLARE_METATYPE(Screens::FormFactor)
++
  #endif // SCREENS_H