1
=== modified file 'examples/server_example_canonical_window_manager.cpp'
2
--- examples/server_example_canonical_window_manager.cpp	2015-04-28 16:24:07 +0000
3
+++ examples/server_example_canonical_window_manager.cpp	2015-04-28 16:24:07 +0000
4
@@ -722,7 +722,7 @@
5
722
    Size const& requested_size,
722
    Size const& requested_size,
6
723
    bool const left_resize,
723
    bool const left_resize,
7
724
    bool const top_resize,
724
    bool const top_resize,
9
725
    Rectangle const& bounds)
725
    Rectangle const& /*bounds*/)
10
726
{
726
{
11
727
    auto const& surface_info = tools->info_for(surface);
727
    auto const& surface_info = tools->info_for(surface);
12
728
728
13
@@ -816,35 +816,7 @@
14
816
    if (top_resize)
816
    if (top_resize)
15
817
        new_pos.y += new_size.height - requested_size.height;
817
        new_pos.y += new_size.height - requested_size.height;
16
818
818
46
819
    if (left_resize)
819
    // placeholder - constrain onscreen
18
820
    {
19
821
        if (new_pos.x < bounds.top_left.x)
20
822
        {
21
823
            new_size.width = new_size.width + (new_pos.x - bounds.top_left.x);
22
824
            new_pos.x = bounds.top_left.x;
23
825
        }
24
826
    }
25
827
    else
26
828
    {
27
829
        auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
28
830
        if (to_bottom_right.dx < DeltaX{0})
29
831
            new_size.width = new_size.width + to_bottom_right.dx;
30
832
    }
31
833
32
834
    if (top_resize)
33
835
    {
34
836
        if (new_pos.y < bounds.top_left.y)
35
837
        {
36
838
            new_size.height = new_size.height + (new_pos.y - bounds.top_left.y);
37
839
            new_pos.y = bounds.top_left.y;
38
840
        }
39
841
    }
40
842
    else
41
843
    {
42
844
        auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
43
845
        if (to_bottom_right.dy < DeltaY{0})
44
846
            new_size.height = new_size.height + to_bottom_right.dy;
45
847
    }
47
848
820
48
849
    switch (surface_info.state)
821
    switch (surface_info.state)
49
850
    {
822
    {
50
@@ -884,7 +856,7 @@
51
884
    return true;
856
    return true;
52
885
}
857
}
53
886
858
55
887
bool me::CanonicalWindowManagerPolicyCopy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle bounds)
859
bool me::CanonicalWindowManagerPolicyCopy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle /*bounds*/)
56
888
{
860
{
57
889
    if (!surface)
861
    if (!surface)
58
890
        return false;
862
        return false;
59
@@ -892,23 +864,9 @@
60
892
    if (!surface->input_area_contains(from) && !tools->info_for(surface).titlebar)
864
    if (!surface->input_area_contains(from) && !tools->info_for(surface).titlebar)
61
893
        return false;
865
        return false;
62
894
866
63
895
    auto const top_left = surface->top_left();
64
896
    auto const surface_size = surface->size();
65
897
    auto const bottom_right = top_left + as_displacement(surface_size);
66
898
67
899
    auto movement = to - from;
867
    auto movement = to - from;
68
900
868
80
901
    if (movement.dx < DeltaX{0})
869
    // placeholder - constrain onscreen
70
902
        movement.dx = std::max(movement.dx, (bounds.top_left - top_left).dx);
71
903
72
904
    if (movement.dy < DeltaY{0})
73
905
        movement.dy = std::max(movement.dy, (bounds.top_left - top_left).dy);
74
906
75
907
    if (movement.dx > DeltaX{0})
76
908
        movement.dx = std::min(movement.dx, (bounds.bottom_right() - bottom_right).dx);
77
909
78
910
    if (movement.dy > DeltaY{0})
79
911
        movement.dy = std::min(movement.dy, (bounds.bottom_right() - bottom_right).dy);
81
912
870
82
913
    move_tree(surface, movement);
871
    move_tree(surface, movement);
83
914
872
84
915
873
85
=== modified file 'src/server/shell/canonical_window_manager.cpp'
86
--- src/server/shell/canonical_window_manager.cpp	2015-04-28 16:24:07 +0000
87
+++ src/server/shell/canonical_window_manager.cpp	2015-04-28 16:24:07 +0000
88
@@ -637,7 +637,7 @@
89
637
    Size const& requested_size,
637
    Size const& requested_size,
90
638
    bool const left_resize,
638
    bool const left_resize,
91
639
    bool const top_resize,
639
    bool const top_resize,
93
640
    Rectangle const& bounds)
640
    Rectangle const& /*bounds*/)
94
641
{
641
{
95
642
    auto const& surface_info = tools->info_for(surface);
642
    auto const& surface_info = tools->info_for(surface);
96
643
643
97
@@ -731,35 +731,7 @@
98
731
    if (top_resize)
731
    if (top_resize)
99
732
        new_pos.y += new_size.height - requested_size.height;
732
        new_pos.y += new_size.height - requested_size.height;
100
733
733
130
734
    if (left_resize)
734
    // placeholder - constrain onscreen
102
735
    {
103
736
        if (new_pos.x < bounds.top_left.x)
104
737
        {
105
738
            new_size.width = new_size.width + (new_pos.x - bounds.top_left.x);
106
739
            new_pos.x = bounds.top_left.x;
107
740
        }
108
741
    }
109
742
    else
110
743
    {
111
744
        auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
112
745
        if (to_bottom_right.dx < DeltaX{0})
113
746
            new_size.width = new_size.width + to_bottom_right.dx;
114
747
    }
115
748
116
749
    if (top_resize)
117
750
    {
118
751
        if (new_pos.y < bounds.top_left.y)
119
752
        {
120
753
            new_size.height = new_size.height + (new_pos.y - bounds.top_left.y);
121
754
            new_pos.y = bounds.top_left.y;
122
755
        }
123
756
    }
124
757
    else
125
758
    {
126
759
        auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
127
760
        if (to_bottom_right.dy < DeltaY{0})
128
761
            new_size.height = new_size.height + to_bottom_right.dy;
129
762
    }
131
763
735
132
764
    switch (surface_info.state)
736
    switch (surface_info.state)
133
765
    {
737
    {
134
@@ -798,27 +770,13 @@
135
798
    return true;
770
    return true;
136
799
}
771
}
137
800
772
139
801
bool msh::CanonicalWindowManagerPolicy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle bounds)
773
bool msh::CanonicalWindowManagerPolicy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle /*bounds*/)
140
802
{
774
{
141
803
    if (surface && surface->input_area_contains(from))
775
    if (surface && surface->input_area_contains(from))
142
804
    {
776
    {
143
805
        auto const top_left = surface->top_left();
144
806
        auto const surface_size = surface->size();
145
807
        auto const bottom_right = top_left + as_displacement(surface_size);
146
808
147
809
        auto movement = to - from;
777
        auto movement = to - from;
148
810
778
160
811
        if (movement.dx < DeltaX{0})
779
        // placeholder - constrain onscreen
150
812
            movement.dx = std::max(movement.dx, (bounds.top_left - top_left).dx);
151
813
152
814
        if (movement.dy < DeltaY{0})
153
815
            movement.dy = std::max(movement.dy, (bounds.top_left - top_left).dy);
154
816
155
817
        if (movement.dx > DeltaX{0})
156
818
            movement.dx = std::min(movement.dx, (bounds.bottom_right() - bottom_right).dx);
157
819
158
820
        if (movement.dy > DeltaY{0})
159
821
            movement.dy = std::min(movement.dy, (bounds.bottom_right() - bottom_right).dy);
161
822
780
162
823
        move_tree(surface, movement);
781
        move_tree(surface, movement);
163
824
782
Reviewer	Review Type	Date Requested	Status
Daniel van Vugt		2015-04-22	Approve on 2015-04-29
PS Jenkins bot (community)	continuous-integration		Approve on 2015-04-28
Review via email: mp+257114@code.launchpad.net
1	=== modified file 'examples/server_example_canonical_window_manager.cpp'
2	--- examples/server_example_canonical_window_manager.cpp 2015-04-28 16:24:07 +0000
3	+++ examples/server_example_canonical_window_manager.cpp 2015-04-28 16:24:07 +0000
4	@@ -722,7 +722,7 @@
5	722	Size const& requested_size,	722	Size const& requested_size,
6	723	bool const left_resize,	723	bool const left_resize,
7	724	bool const top_resize,	724	bool const top_resize,
9	725	Rectangle const& bounds)	725	Rectangle const& /bounds/)
10	726	{	726	{
11	727	auto const& surface_info = tools->info_for(surface);	727	auto const& surface_info = tools->info_for(surface);
12	728		728
13	@@ -816,35 +816,7 @@
14	816	if (top_resize)	816	if (top_resize)
15	817	new_pos.y += new_size.height - requested_size.height;	817	new_pos.y += new_size.height - requested_size.height;
16	818		818
46	819	if (left_resize)	819	// placeholder - constrain onscreen
18	820	{
19	821	if (new_pos.x < bounds.top_left.x)
20	822	{
21	823	new_size.width = new_size.width + (new_pos.x - bounds.top_left.x);
22	824	new_pos.x = bounds.top_left.x;
23	825	}
24	826	}
25	827	else
26	828	{
27	829	auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
28	830	if (to_bottom_right.dx < DeltaX{0})
29	831	new_size.width = new_size.width + to_bottom_right.dx;
30	832	}
31	833
32	834	if (top_resize)
33	835	{
34	836	if (new_pos.y < bounds.top_left.y)
35	837	{
36	838	new_size.height = new_size.height + (new_pos.y - bounds.top_left.y);
37	839	new_pos.y = bounds.top_left.y;
38	840	}
39	841	}
40	842	else
41	843	{
42	844	auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
43	845	if (to_bottom_right.dy < DeltaY{0})
44	846	new_size.height = new_size.height + to_bottom_right.dy;
45	847	}
47	848		820
48	849	switch (surface_info.state)	821	switch (surface_info.state)
49	850	{	822	{
50	@@ -884,7 +856,7 @@
51	884	return true;	856	return true;
52	885	}	857	}
53	886		858
55	887	bool me::CanonicalWindowManagerPolicyCopy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle bounds)	859	bool me::CanonicalWindowManagerPolicyCopy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle /bounds/)
56	888	{	860	{
57	889	if (!surface)	861	if (!surface)
58	890	return false;	862	return false;
59	@@ -892,23 +864,9 @@
60	892	if (!surface->input_area_contains(from) && !tools->info_for(surface).titlebar)	864	if (!surface->input_area_contains(from) && !tools->info_for(surface).titlebar)
61	893	return false;	865	return false;
62	894		866
63	895	auto const top_left = surface->top_left();
64	896	auto const surface_size = surface->size();
65	897	auto const bottom_right = top_left + as_displacement(surface_size);
66	898
67	899	auto movement = to - from;	867	auto movement = to - from;
68	900		868
80	901	if (movement.dx < DeltaX{0})	869	// placeholder - constrain onscreen
70	902	movement.dx = std::max(movement.dx, (bounds.top_left - top_left).dx);
71	903
72	904	if (movement.dy < DeltaY{0})
73	905	movement.dy = std::max(movement.dy, (bounds.top_left - top_left).dy);
74	906
75	907	if (movement.dx > DeltaX{0})
76	908	movement.dx = std::min(movement.dx, (bounds.bottom_right() - bottom_right).dx);
77	909
78	910	if (movement.dy > DeltaY{0})
79	911	movement.dy = std::min(movement.dy, (bounds.bottom_right() - bottom_right).dy);
81	912		870
82	913	move_tree(surface, movement);	871	move_tree(surface, movement);
83	914		872
84	915		873
85	=== modified file 'src/server/shell/canonical_window_manager.cpp'
86	--- src/server/shell/canonical_window_manager.cpp 2015-04-28 16:24:07 +0000
87	+++ src/server/shell/canonical_window_manager.cpp 2015-04-28 16:24:07 +0000
88	@@ -637,7 +637,7 @@
89	637	Size const& requested_size,	637	Size const& requested_size,
90	638	bool const left_resize,	638	bool const left_resize,
91	639	bool const top_resize,	639	bool const top_resize,
93	640	Rectangle const& bounds)	640	Rectangle const& /bounds/)
94	641	{	641	{
95	642	auto const& surface_info = tools->info_for(surface);	642	auto const& surface_info = tools->info_for(surface);
96	643		643
97	@@ -731,35 +731,7 @@
98	731	if (top_resize)	731	if (top_resize)
99	732	new_pos.y += new_size.height - requested_size.height;	732	new_pos.y += new_size.height - requested_size.height;
100	733		733
130	734	if (left_resize)	734	// placeholder - constrain onscreen
102	735	{
103	736	if (new_pos.x < bounds.top_left.x)
104	737	{
105	738	new_size.width = new_size.width + (new_pos.x - bounds.top_left.x);
106	739	new_pos.x = bounds.top_left.x;
107	740	}
108	741	}
109	742	else
110	743	{
111	744	auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
112	745	if (to_bottom_right.dx < DeltaX{0})
113	746	new_size.width = new_size.width + to_bottom_right.dx;
114	747	}
115	748
116	749	if (top_resize)
117	750	{
118	751	if (new_pos.y < bounds.top_left.y)
119	752	{
120	753	new_size.height = new_size.height + (new_pos.y - bounds.top_left.y);
121	754	new_pos.y = bounds.top_left.y;
122	755	}
123	756	}
124	757	else
125	758	{
126	759	auto to_bottom_right = bounds.bottom_right() - (new_pos + as_displacement(new_size));
127	760	if (to_bottom_right.dy < DeltaY{0})
128	761	new_size.height = new_size.height + to_bottom_right.dy;
129	762	}
131	763		735
132	764	switch (surface_info.state)	736	switch (surface_info.state)
133	765	{	737	{
134	@@ -798,27 +770,13 @@
135	798	return true;	770	return true;
136	799	}	771	}
137	800		772
139	801	bool msh::CanonicalWindowManagerPolicy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle bounds)	773	bool msh::CanonicalWindowManagerPolicy::drag(std::shared_ptr<ms::Surface> surface, Point to, Point from, Rectangle /bounds/)
140	802	{	774	{
141	803	if (surface && surface->input_area_contains(from))	775	if (surface && surface->input_area_contains(from))
142	804	{	776	{
143	805	auto const top_left = surface->top_left();
144	806	auto const surface_size = surface->size();
145	807	auto const bottom_right = top_left + as_displacement(surface_size);
146	808
147	809	auto movement = to - from;	777	auto movement = to - from;
148	810		778
160	811	if (movement.dx < DeltaX{0})	779	// placeholder - constrain onscreen
150	812	movement.dx = std::max(movement.dx, (bounds.top_left - top_left).dx);
151	813
152	814	if (movement.dy < DeltaY{0})
153	815	movement.dy = std::max(movement.dy, (bounds.top_left - top_left).dy);
154	816
155	817	if (movement.dx > DeltaX{0})
156	818	movement.dx = std::min(movement.dx, (bounds.bottom_right() - bottom_right).dx);
157	819
158	820	if (movement.dy > DeltaY{0})
159	821	movement.dy = std::min(movement.dy, (bounds.bottom_right() - bottom_right).dy);
161	822		780
162	823	move_tree(surface, movement);	781	move_tree(surface, movement);
163	824		782