Merge lp:~dandrader/qtmir/miral-smallFixes into lp:~unity-team/qtmir/miral-qt-integration

[Daniel d'Andrada]

MirSurface: Improve logging and don't use miral::Window of a dead surface

+ Update mirSurfaceTypeToStr

Some small fixes

[Gerry Boland (gerboland)]

+ return "";
replacing this with a Q_UNREACHABLE() should compile.
Rest looks good

review: Needs Fixing

[lp:~dandrader/qtmir/miral-smallFixes]

585. By Daniel d'Andrada on 2016-11-25

use Q_UNREACHABLE()

[Daniel d'Andrada (dandrader)]

On 25/11/2016 13:43, Gerry Boland wrote:
> Review: Needs Fixing
>
> + return "";
> replacing this with a Q_UNREACHABLE() should compile.
> Rest looks good

Done.

[Gerry Boland (gerboland)]

review: Approve

=== modified file 'src/common/debughelpers.cpp'
--- src/common/debughelpers.cpp	2016-11-03 20:17:46 +0000
+++ src/common/debughelpers.cpp	2016-11-25 15:46:29 +0000
@@ -115,23 +115,18 @@
 const char *mirSurfaceTypeToStr(int value)
 {
     switch (value) {
-    case mir_surface_type_normal:
-        return "normal";
-    case mir_surface_type_utility:
-        return "utility";
-    case mir_surface_type_dialog:
-        return "dialog";
-    case mir_surface_type_overlay:
-        return "overlay";
-    case mir_surface_type_freestyle:
-        return "freestyle";
-    case mir_surface_type_popover:
-        return "popover";
-    case mir_surface_type_inputmethod:
-        return "inputmethod";
-    default:
-        return "???";
+    case mir_surface_type_normal:       return "normal";        /**< AKA "regular"                   */
+    case mir_surface_type_utility:      return "utility";       /**< AKA "floating regular"          */
+    case mir_surface_type_dialog:       return "dialog";
+    case mir_surface_type_gloss:        return "gloss";
+    case mir_surface_type_freestyle:    return "freestyle";
+    case mir_surface_type_menu:         return "menu";
+    case mir_surface_type_inputmethod:  return "input Method";  /**< AKA "OSK" or handwriting etc.   */
+    case mir_surface_type_satellite:    return "satellite";     /**< AKA "toolbox"/"toolbar"         */
+    case mir_surface_type_tip:          return "tip";           /**< AKA "tooltip"                   */
+    case mir_surface_types:             Q_UNREACHABLE();
     }
+    Q_UNREACHABLE();
 }
 
 const char *mirSurfaceStateToStr(int value)

=== modified file 'src/modules/Unity/Application/mirsurface.cpp'
--- src/modules/Unity/Application/mirsurface.cpp	2016-11-22 18:01:11 +0000
+++ src/modules/Unity/Application/mirsurface.cpp	2016-11-25 15:46:29 +0000
@@ -134,7 +134,10 @@
     , m_state(toQtState(newWindowInfo.windowInfo.state()))
     , m_shellChrome(Mir::NormalChrome)
 {
-    DEBUG_MSG << "()";
+    DEBUG_MSG << "("
+        << "type=" << mirSurfaceTypeToStr(m_type)
+        << ",state=" << unityapiMirStateToStr(m_state)
+        << ")";
 
     SurfaceObserver::registerObserverForSurface(m_surfaceObserver.get(), m_surface.get());
     m_surface->add_observer(m_surfaceObserver);
@@ -903,7 +906,9 @@
 void MirSurface::activate()
 {
     DEBUG_MSG << "()";
-    m_controller->activate(m_window);
+    if (m_live) {
+        m_controller->activate(m_window);
+    }
 }
 
 void MirSurface::onCloseTimedOut()
@@ -914,7 +919,9 @@
 
     m_closingState = CloseOverdue;
 
-    m_controller->forceClose(m_window);
+    if (m_live) {
+        m_controller->forceClose(m_window);
+    }
 }
 
 void MirSurface::setCloseTimer(AbstractTimer *timer)
@@ -960,7 +967,10 @@
     if (point != m_requestedPosition) {
         m_requestedPosition = point;
         Q_EMIT requestedPositionChanged(m_requestedPosition);
-        m_controller->move(m_window, m_requestedPosition);
+
+        if (m_live) {
+            m_controller->move(m_window, m_requestedPosition);
+        }
     }
 }