MirAL

Merge lp:~alan-griffiths/miral/WindowManagementPolicy-advise_move_to into lp:miral

  1. WindowManagementPolicy-advise_move_to
  2. Merge into trunk
Proposed by Alan Griffiths on 2016-06-08
Status: Merged
Approved by: Gerry Boland on 2016-06-08
Approved revision: 204
Merged at revision: 204
Proposed branch: lp:~alan-griffiths/miral/WindowManagementPolicy-advise_move_to
Merge into: lp:miral
Diff against target: 126 lines (+25/-1)
10 files modified
include/miral/canonical_window_manager.h (+1/-0)
include/miral/window_management_policy.h (+1/-0)
miral-kiosk/kiosk_window_manager.cpp (+4/-0)
miral-kiosk/kiosk_window_manager.h (+1/-0)
miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp (+4/-0)
miral-qt/src/platforms/mirserver/windowmanagementpolicy.h (+1/-0)
miral-shell/tiling_window_manager.cpp (+4/-0)
miral-shell/tiling_window_manager.h (+1/-0)
miral/basic_window_manager.cpp (+4/-1)
miral/canonical_window_manager.cpp (+4/-0)
To merge this branch: bzr merge lp:~alan-griffiths/miral/WindowManagementPolicy-advise_move_to
Reviewer Review Type Date Requested Status
Gerry Boland 2016-06-08 Approve on 2016-06-08
Review via email: mp+296805@code.launchpad.net

Commit Message

Add WindowManagementPolicy::advise_move_to()

To post a comment you must log in.
Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/miral/canonical_window_manager.h'
2--- include/miral/canonical_window_manager.h 2016-06-08 14:20:47 +0000
3+++ include/miral/canonical_window_manager.h 2016-06-08 15:17:36 +0000
4@@ -64,6 +64,7 @@
5 void advise_focus_lost(WindowInfo const& info) override;
6 void advise_focus_gained(WindowInfo const& info) override;
7 void advise_state_change(WindowInfo const& window_info, MirSurfaceState state) override;
8+ void advise_move_to(miral::WindowInfo const& window_info, Point top_left) override;
9 void advise_resize(WindowInfo const& window_info, Size const& new_size) override;
10 void advise_delete_window(WindowInfo const& window_info) override;
11
12
13=== modified file 'include/miral/window_management_policy.h'
14--- include/miral/window_management_policy.h 2016-06-08 14:28:21 +0000
15+++ include/miral/window_management_policy.h 2016-06-08 15:17:36 +0000
16@@ -69,6 +69,7 @@
17 virtual void advise_focus_lost(WindowInfo const& info) = 0;
18 virtual void advise_focus_gained(WindowInfo const& info) = 0;
19 virtual void advise_state_change(WindowInfo const& window_info, MirSurfaceState state) = 0;
20+ virtual void advise_move_to(WindowInfo const& window_info, Point top_left) = 0;
21 virtual void advise_resize(WindowInfo const& window_info, Size const& new_size) = 0;
22 virtual void advise_delete_window(WindowInfo const& window_info) = 0;
23
24
25=== modified file 'miral-kiosk/kiosk_window_manager.cpp'
26--- miral-kiosk/kiosk_window_manager.cpp 2016-06-08 14:20:47 +0000
27+++ miral-kiosk/kiosk_window_manager.cpp 2016-06-08 15:17:36 +0000
28@@ -212,3 +212,7 @@
29 void KioskWindowManagerPolicy::advise_raise(std::vector<miral::Window> const& /*windows*/)
30 {
31 }
32+
33+void KioskWindowManagerPolicy::advise_move_to(miral::WindowInfo const& /*window_info*/, Point /*top_left*/)
34+{
35+}
36
37=== modified file 'miral-kiosk/kiosk_window_manager.h'
38--- miral-kiosk/kiosk_window_manager.h 2016-06-08 14:20:47 +0000
39+++ miral-kiosk/kiosk_window_manager.h 2016-06-08 15:17:36 +0000
40@@ -59,6 +59,7 @@
41
42 void advise_focus_gained(miral::WindowInfo const& info) override;
43 void advise_state_change(miral::WindowInfo const& window_info, MirSurfaceState state) override;
44+ void advise_move_to(miral::WindowInfo const& window_info, Point top_left) override;
45 void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
46 void advise_raise(std::vector<miral::Window> const& windows) override;
47
48
49=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp'
50--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp 2016-06-08 14:54:18 +0000
51+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp 2016-06-08 15:17:36 +0000
52@@ -106,6 +106,10 @@
53
54 }
55
56+void WindowManagementPolicy::advise_move_to(miral::WindowInfo const& /*window_info*/, Point /*top_left*/)
57+{
58+}
59+
60 void WindowManagementPolicy::advise_resize(const miral::WindowInfo &/*info*/, const Size &/*newSize*/)
61 {
62
63
64=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.h'
65--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.h 2016-06-08 14:54:18 +0000
66+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.h 2016-06-08 15:17:36 +0000
67@@ -57,6 +57,7 @@
68 void advise_focus_lost(const miral::WindowInfo &info) override;
69 void advise_focus_gained(const miral::WindowInfo &info) override;
70 void advise_state_change(const miral::WindowInfo &info, MirSurfaceState state) override;
71+ void advise_move_to(miral::WindowInfo const& window_info, Point top_left) override;
72 void advise_resize(const miral::WindowInfo &info, const Size &newSize) override;
73 void advise_delete_window(const miral::WindowInfo &windowInfo) override;
74 void advise_raise(std::vector<miral::Window> const& windows) override;
75
76=== modified file 'miral-shell/tiling_window_manager.cpp'
77--- miral-shell/tiling_window_manager.cpp 2016-06-08 14:20:47 +0000
78+++ miral-shell/tiling_window_manager.cpp 2016-06-08 15:17:36 +0000
79@@ -573,3 +573,7 @@
80 void TilingWindowManagerPolicy::advise_raise(std::vector<miral::Window> const& /*windows*/)
81 {
82 }
83+
84+void TilingWindowManagerPolicy::advise_move_to(miral::WindowInfo const& /*window_info*/, Point /*top_left*/)
85+{
86+}
87
88=== modified file 'miral-shell/tiling_window_manager.h'
89--- miral-shell/tiling_window_manager.h 2016-06-08 14:20:47 +0000
90+++ miral-shell/tiling_window_manager.h 2016-06-08 15:17:36 +0000
91@@ -60,6 +60,7 @@
92 void advise_focus_lost(miral::WindowInfo const& info) override;
93 void advise_focus_gained(miral::WindowInfo const& info) override;
94 void advise_state_change(miral::WindowInfo const& window_info, MirSurfaceState state) override;
95+ void advise_move_to(miral::WindowInfo const& window_info, Point top_left) override;
96 void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
97 void advise_raise(std::vector<miral::Window> const& windows) override;
98
99
100=== modified file 'miral/basic_window_manager.cpp'
101--- miral/basic_window_manager.cpp 2016-06-08 14:20:47 +0000
102+++ miral/basic_window_manager.cpp 2016-06-08 15:17:36 +0000
103@@ -497,7 +497,10 @@
104
105 void miral::BasicWindowManager::move_tree(miral::WindowInfo& root, mir::geometry::Displacement movement)
106 {
107- root.window().move_to(root.window().top_left() + movement);
108+ auto const top_left = root.window().top_left() + movement;
109+
110+ policy->advise_move_to(root, top_left);
111+ root.window().move_to(top_left);
112
113 for (auto const& child: root.children())
114 move_tree(info_for(child), movement);
115
116=== modified file 'miral/canonical_window_manager.cpp'
117--- miral/canonical_window_manager.cpp 2016-06-08 14:20:47 +0000
118+++ miral/canonical_window_manager.cpp 2016-06-08 15:17:36 +0000
119@@ -405,3 +405,7 @@
120 void miral::CanonicalWindowManagerPolicy::advise_raise(std::vector<miral::Window> const& /*windows*/)
121 {
122 }
123+
124+void miral::CanonicalWindowManagerPolicy::advise_move_to(miral::WindowInfo const& /*window_info*/, Point /*top_left*/)
125+{
126+}

Subscribers

People subscribed via source and target branches