Merge lp:~dandrader/qtubuntu/resizeToolTip into lp:qtubuntu

[Daniel d'Andrada]

Resize menus and toolips when told to do so

Fixes the following bug that you can see when running the childWindows branches + https://code.launchpad.net/~alan-griffiths/miral/fix-1652109/+merge/313782

1 - launch Kate
2 - Open some big text file (at least hundreds of lines long)
3 - scroll to the very top
4 - shorten the Kate window so that it doesn't not show many lines at once
5 - press and hold the down arrow on the scroll bar
6 - see the tooltip displaying some line numbers

expected outcome:
tooltip gets wider once it starts diplaying numbers bigger than 99

actual outcome:
numbers get squeezed once they get past 99

[lp:~dandrader/qtubuntu/resizeToolTip]

361. By Gerry Boland on 2017-01-04

Remove mircommon specifier for header, fix other ftbfs with mir 0.25 (LP: #1653905)

Approved by: Albert Astals Cid, Unity8 CI Bot

362. By CI Train Bot Account on 2017-01-04

Releasing 0.63+17.04.20170104-0ubuntu1

363. By CI Train Bot Account on 2017-01-16

Resync trunk.

364. By Daniel d'Andrada on 2017-01-18

Resize menus and toolips when told to do so

365. By Daniel d'Andrada on 2017-01-18

Also move child window when updating its geometry

366. By Daniel d'Andrada on 2017-01-19

Fix positioning

367. By Daniel d'Andrada on 2017-01-19

Update copyright header

Unmerged revisions

=== modified file 'debian/control'
--- debian/control	2016-09-22 19:45:30 +0000
+++ debian/control	2016-12-22 19:19:53 +0000
@@ -10,7 +10,7 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                libinput-dev,
-               libmirclient-dev (>= 0.13.0),
+               libmirclient-dev (>= 0.25.0),
                libmirclient-debug-extension-dev,
                libmtdev-dev,
                libubuntu-application-api-dev (>= 2.9.0),

=== modified file 'src/ubuntumirclient/input.cpp'
--- src/ubuntumirclient/input.cpp	2016-11-04 13:24:35 +0000
+++ src/ubuntumirclient/input.cpp	2016-12-22 19:19:53 +0000
@@ -232,6 +232,8 @@
         return "surface_output";
     case mir_event_type_input_device_state:
         return "input_device_state";
+    case mir_event_type_surface_placement:
+        return "surface_placement";
     }
     Q_UNREACHABLE();
 }
@@ -328,6 +330,8 @@
     case mir_input_event_type_pointer:
         dispatchPointerEvent(window, ev);
         break;
+    case mir_input_event_types:
+        Q_UNREACHABLE();
     }
 }
 
@@ -370,6 +374,9 @@
             break;
         case mir_touch_action_change:
             touchPoint.state = Qt::TouchPointMoved;
+            break;
+        case mir_touch_actions:
+            Q_UNREACHABLE();
         }
 
         touchPoints.append(touchPoint);
@@ -530,6 +537,8 @@
     case mir_pointer_action_leave:
         QWindowSystemInterface::handleLeaveEvent(window);
         break;
+    case mir_pointer_actions:
+        Q_UNREACHABLE();
     }
 }
 

=== modified file 'src/ubuntumirclient/screen.h'
--- src/ubuntumirclient/screen.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/screen.h	2016-12-22 19:19:53 +0000
@@ -20,7 +20,7 @@
 #include <qpa/qplatformscreen.h>
 #include <QSurfaceFormat>
 
-#include <mircommon/mir_toolkit/common.h> // just for MirFormFactor enum
+#include <mir_toolkit/common.h> // just for MirFormFactor enum
 
 #include "cursor.h"
 

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-11-23 12:11:14 +0000
+++ src/ubuntumirclient/window.cpp	2016-12-22 19:19:53 +0000
@@ -222,18 +222,6 @@
     return requiresParent(qtWindowTypeToMirSurfaceType(type));
 }
 
-bool isMovable(const Qt::WindowType type)
-{
-    auto mirType = qtWindowTypeToMirSurfaceType(type);
-    switch (mirType) {
-    case mir_surface_type_menu:
-    case mir_surface_type_tip:
-        return true;
-    default:
-        return false;
-    }
-}
-
 Spec makeSurfaceSpec(QWindow *window, MirPixelFormat pixelFormat, UbuntuWindow *parentWindowHandle,
                      MirConnection *connection)
 {
@@ -537,14 +525,10 @@
     qCDebug(ubuntumirclient,"updateGeometry(window=%p, width=%d, height=%d)", mWindow,
             newGeometry.width(), newGeometry.height());
 
-    Spec spec;
-    if (isMovable(mWindow->type())) {
-        spec = Spec{makeSurfaceSpec(mWindow, mPixelFormat, mParentWindowHandle, mConnection)};
-    } else {
-        spec = Spec{mir_connection_create_spec_for_changes(mConnection)};
-        mir_surface_spec_set_width(spec.get(), newGeometry.width());
-        mir_surface_spec_set_height(spec.get(), newGeometry.height());
-    }
+    auto spec = Spec{mir_connection_create_spec_for_changes(mConnection)};
+    mir_surface_spec_set_width(spec.get(), newGeometry.width());
+    mir_surface_spec_set_height(spec.get(), newGeometry.height());
+
     mir_surface_apply_spec(mMirSurface, spec.get());
 }