Merge lp:~lukas-kde/qtubuntu/liveCaption into lp:qtubuntu

[Lukáš Tinkl]

Override QPlatformWindow::setWindowTitle() and update the caption accordingly

Override QPlatformWindow::setWindowTitle() and update the caption accordingly

Cf. https://bugs.launchpad.net/ubuntu/+source/unity-api/+bug/1497092

* Are there any related MPs required for this MP to build/function as expected? Please list.

No

* Did you perform an exploratory manual test run of your code change and any related functionality?

Yes

* Did you make sure that your branch does not contain spurious tags?

Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?

Yes

* If you changed the UI, has there been a design review?

N/A

[lp:~lukas-kde/qtubuntu/liveCaption]

283. By Lukáš Tinkl on 2015-09-29

remove debug

284. By Lukáš Tinkl on 2015-09-29

recognize the back/forward buttons

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:283
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/248/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/39/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/248/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:284
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/41
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/41/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/250/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

The changes in src/ubuntumirclient/input.cpp are completely unrelated. Please put them in a separate MP.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

You should override QPlatformWindow::setWindowTitle instead of listening to QWindow::windowTitleChanged

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

Should we append the application display name to the window title, as the QPlatformWindow::setWindowTitle suggests?

[Daniel d'Andrada (dandrader)]

> Should we append the application display name to the window title, as the
> QPlatformWindow::setWindowTitle suggests?

hmm... we might just leave it for a layer higher up, like unity8

[lp:~lukas-kde/qtubuntu/liveCaption]

285. By Lukáš Tinkl on 2015-09-29

override setWindowTitle()

286. By Lukáš Tinkl on 2015-09-29

remove unrelated input.cpp changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:285
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/251/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/42
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/42/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/251/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:286
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/252/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/43
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-wily-armhf-ci/43/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-ci/252/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Looks good to me.

review: Approve

=== modified file 'src/ubuntumirclient/window.cpp'
--- src/ubuntumirclient/window.cpp	2015-08-28 08:12:42 +0000
+++ src/ubuntumirclient/window.cpp	2015-09-29 18:14:27 +0000
@@ -23,7 +23,6 @@
 
 // Qt
 #include <qpa/qwindowsysteminterface.h>
-#include <qpa/qwindowsysteminterface.h>
 #include <QMutex>
 #include <QMutexLocker>
 #include <QSize>
@@ -410,6 +409,14 @@
     }
 }
 
+void UbuntuWindow::setWindowTitle(const QString &title)
+{
+    MirSurfaceSpec *spec = mir_connection_create_spec_for_changes(d->connection);
+    mir_surface_spec_set_name(spec, title.toUtf8().constData());
+    mir_surface_apply_spec(d->surface, spec);
+    mir_surface_spec_release(spec);
+}
+
 void* UbuntuWindow::eglSurface() const
 {
     return d->eglSurface;

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2015-05-12 17:30:15 +0000
+++ src/ubuntumirclient/window.h	2015-09-29 18:14:27 +0000
@@ -40,6 +40,7 @@
     void setGeometry(const QRect&) override;
     void setWindowState(Qt::WindowState state) override;
     void setVisible(bool visible) override;
+    void setWindowTitle(const QString &title) override;
 
     // New methods.
     void* eglSurface() const;