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

Proposed by Daniel d'Andrada
Status: Merged
Approved by: Albert Astals Cid
Approved revision: 379
Merged at revision: 385
Proposed branch: lp:~dandrader/qtubuntu/qtToolIsMirSatellite
Merge into: lp:qtubuntu
Diff against target: 30 lines (+11/-1)
1 file modified
src/ubuntumirclient/qmirclientwindow.cpp (+11/-1)
To merge this branch: bzr merge lp:~dandrader/qtubuntu/qtToolIsMirSatellite
Reviewer Review Type Date Requested Status
Albert Astals Cid (community) Approve
Unity8 CI Bot continuous-integration Approve
Review via email: mp+320178@code.launchpad.net

Commit message

Qt::Tool == mir_window_type_satellite

Description of the change

Proper support for windows of Qt::Tool type.

For Tool windows to work properly support on the unity8 side is also needed

To post a comment you must log in.
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:379
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/211/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4534
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4562
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4389/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4389
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4389/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/211/rebuild

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ubuntumirclient/qmirclientwindow.cpp'
2--- src/ubuntumirclient/qmirclientwindow.cpp 2017-03-08 11:58:41 +0000
3+++ src/ubuntumirclient/qmirclientwindow.cpp 2017-03-17 13:21:50 +0000
4@@ -174,8 +174,9 @@
5 case Qt::Drawer:
6 return mir_window_type_utility;
7 case Qt::Popup:
8+ return mir_window_type_menu;
9 case Qt::Tool:
10- return mir_window_type_menu;
11+ return mir_window_type_satellite;
12 case Qt::ToolTip:
13 return mir_window_type_tip;
14 case Qt::SplashScreen:
15@@ -262,6 +263,15 @@
16 case mir_window_type_inputmethod:
17 spec = Spec{mir_create_input_method_window_spec(connection, width, height)};
18 break;
19+ case mir_window_type_satellite:
20+ // There's no helper function for satellite windows. Guess they're not very popular
21+ spec = Spec{mir_create_window_spec(connection)};
22+ mir_window_spec_set_type(spec.get(), mir_window_type_satellite);
23+ mir_window_spec_set_buffer_usage(spec.get(), mir_buffer_usage_hardware);
24+ mir_window_spec_set_parent(spec.get(), parent);
25+ mir_window_spec_set_width(spec.get(), width);
26+ mir_window_spec_set_height(spec.get(), height);
27+ break;
28 default:
29 spec = Spec{mir_create_normal_window_spec(connection, width, height)};
30 break;

Subscribers

People subscribed via source and target branches