git.iko.soy/unity8
on xenial help sign in
Work around (very likely) Qt bug
2c54cbdDaniel d'Andrada
src/ShellView.cpp+23
compare with xenial
unifiedsplit
@@ -18,6 +18,7 @@
18
18
19// Qt
19// Qt
20#include <QQmlContext>
20#include <QQmlContext>
21+#include <QQuickItem>
21
22
22// local
23// local
23#include <paths.h>
24#include <paths.h>
@@ -33,4 +34,26 @@ ShellView::ShellView(QQmlEngine *engine, QObject *qmlArgs)
33
34
34 QUrl source(::qmlDirectory() + "/OrientedShell.qml");
35 QUrl source(::qmlDirectory() + "/OrientedShell.qml");
35 setSource(source);
36 setSource(source);
37+
38+ connect(this, &QWindow::widthChanged, this, &ShellView::onWidthChanged);
39+ connect(this, &QWindow::heightChanged, this, &ShellView::onHeightChanged);
40+}
41+
42+void ShellView::onWidthChanged(int w)
43+{
44+ // For good measure in case SizeRootObjectToView doesn't fulfill its promise.
45+ //
46+ // There's at least one situation that's know to leave the root object with an outdated size.
47+ // (really looks like Qt bug)
48+ // Happens when starting unity8 with an external monitor already connected.
49+ // The QResizeEvent we get still has the size of the first screen and since the resize move is triggered
50+ // from the resize event handler, the root item doesn't get resized.
51+ // TODO: Confirm the Qt bug and submit a patch upstream
52+ rootObject()->setWidth(w);
53+}
54+
55+void ShellView::onHeightChanged(int h)
56+{
57+ // See comment in ShellView::onWidthChanged()
58+ rootObject()->setHeight(h);
36}
59}
src/ShellView.h+4
@@ -25,6 +25,10 @@ class ShellView : public QQuickView
25
25
26public:
26public:
27 ShellView(QQmlEngine *engine, QObject *qmlArgs);
27 ShellView(QQmlEngine *engine, QObject *qmlArgs);
28+
29+private Q_SLOTS:
30+ void onWidthChanged(int);
31+ void onHeightChanged(int);
28};
32};
29
33
30#endif // UNITY_SHELL_VIEW_H
34#endif // UNITY_SHELL_VIEW_H