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

[lp:~lukas-kde/qtmir/use-miral-shell-chrome]

591. By Lukáš Tinkl on 2017-02-07

use the shell_chrome, as provided by WindowInfo::shell_chrome()

592. By Lukáš Tinkl on 2017-02-07

use the conversion instead of static_cast

593. By Lukáš Tinkl on 2017-02-07

merge trunk

594. By Lukáš Tinkl on 2017-02-15

this depends on miral >= 1.2

https://bileto.ubuntu.com/#/ticket/2476

Unmerged revisions

=== modified file 'src/common/mirqtconversion.h'
--- src/common/mirqtconversion.h	2017-01-18 21:24:15 +0000
+++ src/common/mirqtconversion.h	2017-02-07 15:02:47 +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-01-26 17:50:12 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2017-02-07 15:02:47 +0000
@@ -132,7 +132,7 @@
     , m_position(toQPoint(m_window.top_left()))
     , m_size(toQSize(m_window.size()))
     , m_state(toQtState(newWindowInfo.windowInfo.state()))
-    , m_shellChrome(Mir::NormalChrome)
+    , m_shellChrome(toQtShellChrome(newWindowInfo.windowInfo.shell_chrome()))
 {
     DEBUG_MSG << "("
         << "type=" << mirSurfaceTypeToStr(m_type)
@@ -142,8 +142,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);