Merge lp:~lukas-kde/qtmir/use-miral-shell-chrome into lp:qtmir

[Lukáš Tinkl]

Use the shell chrome, as provided by miral window info

Use the shell chrome, as provided by miral window info

Requires: https://code.launchpad.net/~lukas-kde/miral/shellchrome-windowinfo/+merge/316331

[Gerry Boland (gerboland)]

Small nicety I'd appreciate you doing:

    connect(m_surfaceObserver.get(), &SurfaceObserver::shellChromeChanged, this, [&](MirShellChrome shell_chrome) {
        setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));

Please use toQtShellChrome instead of the static_cast here

review: Needs Fixing

[Lukáš Tinkl (lukas-kde)]

> Small nicety I'd appreciate you doing:
>
> connect(m_surfaceObserver.get(), &SurfaceObserver::shellChromeChanged,
> this, [&](MirShellChrome shell_chrome) {
> setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));
>
> Please use toQtShellChrome instead of the static_cast here

Done, also merged with trunk and resolved conflicts there, now that the silo 2313 had landed

[Gerry Boland (gerboland)]

LGTM!

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:594
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/536/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4256
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4284
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4117/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4117/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4117/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4117/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4117/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4117
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4117/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-02-02 09:17:48 +0000
+++ debian/control	2017-02-15 13:13:19 +0000
@@ -13,7 +13,7 @@
                libglib2.0-dev,
                libgsettings-qt-dev,
                liblttng-ust-dev,
-               libmiral-dev (>= 1.1.0),
+               libmiral-dev (>= 1.2),
                libmirclient-dev (>= 0.26.0),
                libmircommon-dev (>= 0.26.0),
                libmirserver-dev (>= 0.26.0),

=== modified file 'src/common/mirqtconversion.h'
--- src/common/mirqtconversion.h	2017-01-18 21:24:15 +0000
+++ src/common/mirqtconversion.h	2017-02-15 13:13:19 +0000
@@ -113,6 +113,15 @@
     }
 }
 
+inline Mir::ShellChrome toQtShellChrome(MirShellChrome chrome)
+{
+    switch (chrome) {
+    case mir_shell_chrome_normal: return Mir::NormalChrome;
+    case mir_shell_chrome_low:    return Mir::LowChrome;
+    default: Q_UNREACHABLE();
+    }
+}
+
 } // namespace qtmir
 
 #endif // MIRQTCONVERSION_H

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2017-02-06 09:11:04 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2017-02-15 13:13:19 +0000
@@ -133,7 +133,7 @@
     , m_surfaceObserver(std::make_shared<SurfaceObserverImpl>())
     , m_size(toQSize(m_window.size()))
     , m_state(toQtState(newWindowInfo.windowInfo.state()))
-    , m_shellChrome(Mir::NormalChrome)
+    , m_shellChrome(toQtShellChrome(newWindowInfo.windowInfo.shell_chrome()))
     , m_parentSurface(parentSurface)
     , m_childSurfaceList(new MirSurfaceListModel(this))
 {
@@ -149,8 +149,6 @@
     SurfaceObserver::registerObserverForSurface(m_surfaceObserver.get(), m_surface.get());
     m_surface->add_observer(m_surfaceObserver);
 
-    //m_shellChrome = creationHints.shellChrome; TODO - where will this come from now?
-
     connect(m_surfaceObserver.get(), &SurfaceObserver::framesPosted, this, &MirSurface::onFramesPostedObserved);
     connect(m_surfaceObserver.get(), &SurfaceObserver::attributeChanged, this, &MirSurface::onAttributeChanged);
     connect(m_surfaceObserver.get(), &SurfaceObserver::nameChanged, this, &MirSurface::onNameChanged);
@@ -162,7 +160,7 @@
     connect(m_surfaceObserver.get(), &SurfaceObserver::widthIncrementChanged, this, &MirSurface::onWidthIncrementChanged);
     connect(m_surfaceObserver.get(), &SurfaceObserver::heightIncrementChanged, this, &MirSurface::onHeightIncrementChanged);
     connect(m_surfaceObserver.get(), &SurfaceObserver::shellChromeChanged, this, [&](MirShellChrome shell_chrome) {
-        setShellChrome(static_cast<Mir::ShellChrome>(shell_chrome));
+        setShellChrome(toQtShellChrome(shell_chrome));
     });
     connect(m_surfaceObserver.get(), &SurfaceObserver::inputBoundsChanged, this, &MirSurface::setInputBounds);
     connect(m_surfaceObserver.get(), &SurfaceObserver::confinesMousePointerChanged, this, &MirSurface::confinesMousePointerChanged);