← Back to branch summary

~lukas-kde/qtmir/betterSessionManagement

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/windowmanagementpolicy.cpp

  • Committer: Gerry Boland
  • Date: 2017-03-24 11:29:56 UTC
  • mfrom: (590.1.35 qtmir)
  • mto: (590.24.1 keyState)
  • mto: This revision was merged to the branch mainline in revision 596.
  • Revision ID: gerry.boland@canonical.com-20170324112956-pwlzbn3jw43879ly
Merge trunk & fix build failure

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/windowmanagementpolicy.cpp
87
87
 
88
88
void WindowManagementPolicy::handle_modify_window(
89
89
    miral::WindowInfo &windowInfo,
90
 
    const miral::WindowSpecification &modifications)
 
90
    const miral::WindowSpecification &modificationsClient)
91
91
{
92
 
    // TODO this applies the default policy. Qt needs to process the request instead
 
92
    miral::WindowSpecification modifications(modificationsClient);
 
93
 
 
94
    if (modifications.size().is_set()) {
 
95
        auto extraWindowInfo = getExtraInfo(windowInfo);
 
96
        QMutexLocker locker(&extraWindowInfo->mutex);
 
97
        if (!extraWindowInfo->allowClientResize) {
 
98
            modifications.size().consume();
 
99
        }
 
100
    }
 
101
 
93
102
    CanonicalWindowManagerPolicy::handle_modify_window(windowInfo, modifications);
94
103
 
95
104
    // TODO Once Qt processes the request we probably don't want to notify from here