1
=== modified file 'qml/Stages/ApplicationWindow.qml'
2
--- qml/Stages/ApplicationWindow.qml	2015-11-23 13:52:39 +0000
3
+++ qml/Stages/ApplicationWindow.qml	2016-02-02 18:08:07 +0000
4
@@ -1,5 +1,5 @@
5
1
/*
1
/*
7
2
 * Copyright 2014-2015 Canonical Ltd.
2
 * Copyright 2014-2016 Canonical Ltd.
8
3
 *
3
 *
9
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
10
5
 * it under the terms of the GNU Lesser General Public License as published by
5
 * it under the terms of the GNU Lesser General Public License as published by
11
@@ -82,6 +82,12 @@
12
82
        property bool surfaceOldEnoughToBeResized: false
82
        property bool surfaceOldEnoughToBeResized: false
13
83
    }
83
    }
14
84
84
15
85
    Binding {
16
86
        target: root.application
17
87
        property: "initialSurfaceSize"
18
88
        value: Qt.size(root.requestedWidth, root.requestedHeight)
19
89
    }
20
90
21
85
    Timer {
91
    Timer {
22
86
        id: surfaceInitTimer
92
        id: surfaceInitTimer
23
87
        interval: 100
93
        interval: 100
24
88
94
25
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.cpp'
26
--- tests/mocks/Unity/Application/ApplicationInfo.cpp	2015-12-08 15:36:53 +0000
27
+++ tests/mocks/Unity/Application/ApplicationInfo.cpp	2016-02-02 18:08:07 +0000
28
@@ -1,5 +1,5 @@
29
1
/*
1
/*
31
2
 * Copyright (C) 2013-2015 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
32
3
 *
3
 *
33
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
34
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
35
@@ -278,3 +278,16 @@
36
278
        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
278
        Q_EMIT exemptFromLifecycleChanged(m_exemptFromLifecycle);
37
279
    }
279
    }
38
280
}
280
}
39
281
40
282
QSize ApplicationInfo::initialSurfaceSize() const
41
283
{
42
284
    return m_initialSurfaceSize;
43
285
}
44
286
45
287
void ApplicationInfo::setInitialSurfaceSize(const QSize &size)
46
288
{
47
289
    if (size != m_initialSurfaceSize) {
48
290
        m_initialSurfaceSize = size;
49
291
        Q_EMIT initialSurfaceSizeChanged(m_initialSurfaceSize);
50
292
    }
51
293
}
52
281
294
53
=== modified file 'tests/mocks/Unity/Application/ApplicationInfo.h'
54
--- tests/mocks/Unity/Application/ApplicationInfo.h	2015-12-07 12:35:11 +0000
55
+++ tests/mocks/Unity/Application/ApplicationInfo.h	2016-02-02 18:08:07 +0000
56
@@ -1,5 +1,5 @@
57
1
/*
1
/*
59
2
 * Copyright (C) 2013-2015 Canonical, Ltd.
2
 * Copyright (C) 2013-2016 Canonical, Ltd.
60
3
 *
3
 *
61
4
 * This program is free software; you can redistribute it and/or modify
4
 * This program is free software; you can redistribute it and/or modify
62
5
 * it under the terms of the GNU General Public License as published by
5
 * it under the terms of the GNU General Public License as published by
63
@@ -95,6 +95,8 @@
64
95
    bool exemptFromLifecycle() const override;
95
    bool exemptFromLifecycle() const override;
65
96
    void setExemptFromLifecycle(bool) override;
96
    void setExemptFromLifecycle(bool) override;
66
97
97
67
98
    QSize initialSurfaceSize() const override;
68
99
    void setInitialSurfaceSize(const QSize &size) override;
69
98
public:
100
public:
70
99
    void setSession(Session* session);
101
    void setSession(Session* session);
71
100
    Session* session() const { return m_session; }
102
    Session* session() const { return m_session; }
72
@@ -129,6 +131,7 @@
73
129
    RequestedState m_requestedState;
131
    RequestedState m_requestedState;
74
130
    bool m_isTouchApp;
132
    bool m_isTouchApp;
75
131
    bool m_exemptFromLifecycle;
133
    bool m_exemptFromLifecycle;
76
134
    QSize m_initialSurfaceSize;
77
132
135
78
133
    bool m_manualSurfaceCreation;
136
    bool m_manualSurfaceCreation;
79
134
};
137
};
80
135
138
81
=== modified file 'tests/plugins/Unity/Launcher/launchermodeltest.cpp'
82
--- tests/plugins/Unity/Launcher/launchermodeltest.cpp	2015-12-03 18:10:39 +0000
83
+++ tests/plugins/Unity/Launcher/launchermodeltest.cpp	2016-02-02 18:08:07 +0000
84
@@ -61,6 +61,8 @@
85
61
    bool isTouchApp() const override { return true; }
61
    bool isTouchApp() const override { return true; }
86
62
    bool exemptFromLifecycle() const override { return false; }
62
    bool exemptFromLifecycle() const override { return false; }
87
63
    void setExemptFromLifecycle(bool) override {}
63
    void setExemptFromLifecycle(bool) override {}
88
64
    QSize initialSurfaceSize() const override { return QSize(); }
89
65
    void setInitialSurfaceSize(const QSize &) override {}
90
64
66
91
65
    // Methods used for mocking (not in the interface)
67
    // Methods used for mocking (not in the interface)
92
66
    void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
68
    void setFocused(bool focused) { m_focused = focused; Q_EMIT focusedChanged(focused); }
Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Abstain on 2016-02-11
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-05
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-05
Nick Dedekind (community)		2016-01-19	Approve on 2016-01-22
Review via email: mp+283223@code.launchpad.net