1
=== modified file 'examples/miral-shell/tiling_window_manager.cpp'
2
--- examples/miral-shell/tiling_window_manager.cpp	2017-08-21 15:58:34 +0000
3
+++ examples/miral-shell/tiling_window_manager.cpp	2017-09-26 20:21:37 +0000
4
@@ -529,20 +529,26 @@
5
529
529
6
530
            if (!window_info.parent())
530
            if (!window_info.parent())
7
531
            {
531
            {
18
532
                auto const new_pos = window.top_left() + (new_tile.top_left - old_tile.top_left);
532
                auto offset_in_tile = window.top_left() - old_tile.top_left;
19
533
                auto const offset = new_pos - new_tile.top_left;
533
                offset_in_tile.dx = std::min(offset_in_tile.dx, as_displacement(new_tile.size).dx);
20
534
534
                offset_in_tile.dy = std::min(offset_in_tile.dy, as_displacement(new_tile.size).dy);
21
535
                // For now just scale if was filling width/height of tile
535
22
536
                auto const old_size = window.size();
536
                Rectangle new_placement{new_tile.top_left + offset_in_tile, window.size()};
23
537
                auto const scaled_width  = old_size.width  == old_tile.size.width  ? new_tile.size.width  : old_size.width;
537
24
538
                auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;
538
                if (window.size().width == old_tile.size.width)
25
539
539
                    new_placement.size.width = new_tile.size.width;
26
540
                auto width  = std::min(new_tile.size.width.as_int()  - offset.dx.as_int(), scaled_width.as_int());
540
27
541
                auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());
541
                if (window.size().height == old_tile.size.height)
28
542
                    new_placement.size.height = new_tile.size.height;
29
543
30
544
                if (!new_placement.overlaps(new_tile))
31
545
                    new_placement.top_left = new_tile.top_left;
32
546
33
547
                new_placement = new_placement.intersection_with(new_tile);
34
542
548
35
543
                WindowSpecification modifications;
549
                WindowSpecification modifications;
38
544
                modifications.top_left() = new_pos;
550
                modifications.top_left() = new_placement.top_left;
39
545
                modifications.size() = {width, height};
551
                modifications.size() = new_placement.size;
40
546
                tools.modify_window(window_info, modifications);
552
                tools.modify_window(window_info, modifications);
41
547
            }
553
            }
42
548
        }
554
        }
43
@@ -652,12 +658,10 @@
44
652
    dirty_displays = true;
658
    dirty_displays = true;
45
653
}
659
}
46
654
660
47
655
#include <iostream>
48
656
void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)
661
void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)
49
657
{
662
{
50
658
    if (!equivalent_display_area(updated, original))
663
    if (!equivalent_display_area(updated, original))
51
659
    {
664
    {
52
660
        std::cout << "Original: " << original.extents() << "new: " << updated.extents() << '\n';
53
661
        live_displays.remove(original.extents());
665
        live_displays.remove(original.extents());
54
662
        live_displays.add(updated.extents());
666
        live_displays.add(updated.extents());
55
663
667
56
664
668
57
=== modified file 'src/miral/display_configuration_listeners.cpp'
58
--- src/miral/display_configuration_listeners.cpp	2017-08-21 14:18:55 +0000
59
+++ src/miral/display_configuration_listeners.cpp	2017-09-26 20:21:37 +0000
60
@@ -83,7 +83,8 @@
61
83
            {
83
            {
62
84
            Output o{output};
84
            Output o{output};
63
85
85
65
86
            if (!o.connected() || !o.valid()) return;
86
            if (!o.valid() || !o.used() || !o.connected() || o.power_mode() != mir_power_mode_on)
66
87
                return;
67
87
88
68
88
            auto op = find_if(
89
            auto op = find_if(
69
89
                begin(active_outputs), end(active_outputs), [&](Output const& oo)
90
                begin(active_outputs), end(active_outputs), [&](Output const& oo)
Status:	Merged
Merged at revision:	4273
Proposed branch:	lp:~alan-griffiths/mir/tiling-after-display-reconfig
Merge into:	lp:mir
Diff against target:	69 lines (+20/-15) 2 files modified examples/miral-shell/tiling_window_manager.cpp (+18/-14) src/miral/display_configuration_listeners.cpp (+2/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/tiling-after-display-reconfig
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-09-27
Mir development team		2017-09-26	Pending
Review via email: mp+331378@code.launchpad.net
1	=== modified file 'examples/miral-shell/tiling_window_manager.cpp'
2	--- examples/miral-shell/tiling_window_manager.cpp 2017-08-21 15:58:34 +0000
3	+++ examples/miral-shell/tiling_window_manager.cpp 2017-09-26 20:21:37 +0000
4	@@ -529,20 +529,26 @@
5	529		529
6	530	if (!window_info.parent())	530	if (!window_info.parent())
7	531	{	531	{
18	532	auto const new_pos = window.top_left() + (new_tile.top_left - old_tile.top_left);	532	auto offset_in_tile = window.top_left() - old_tile.top_left;
19	533	auto const offset = new_pos - new_tile.top_left;	533	offset_in_tile.dx = std::min(offset_in_tile.dx, as_displacement(new_tile.size).dx);
20	534		534	offset_in_tile.dy = std::min(offset_in_tile.dy, as_displacement(new_tile.size).dy);
21	535	// For now just scale if was filling width/height of tile	535
22	536	auto const old_size = window.size();	536	Rectangle new_placement{new_tile.top_left + offset_in_tile, window.size()};
23	537	auto const scaled_width = old_size.width == old_tile.size.width ? new_tile.size.width : old_size.width;	537
24	538	auto const scaled_height = old_size.height == old_tile.size.height ? new_tile.size.height : old_size.height;	538	if (window.size().width == old_tile.size.width)
25	539		539	new_placement.size.width = new_tile.size.width;
26	540	auto width = std::min(new_tile.size.width.as_int() - offset.dx.as_int(), scaled_width.as_int());	540
27	541	auto height = std::min(new_tile.size.height.as_int() - offset.dy.as_int(), scaled_height.as_int());	541	if (window.size().height == old_tile.size.height)
28			542	new_placement.size.height = new_tile.size.height;
29			543
30			544	if (!new_placement.overlaps(new_tile))
31			545	new_placement.top_left = new_tile.top_left;
32			546
33			547	new_placement = new_placement.intersection_with(new_tile);
34	542		548
35	543	WindowSpecification modifications;	549	WindowSpecification modifications;
38	544	modifications.top_left() = new_pos;	550	modifications.top_left() = new_placement.top_left;
39	545	modifications.size() = {width, height};	551	modifications.size() = new_placement.size;
40	546	tools.modify_window(window_info, modifications);	552	tools.modify_window(window_info, modifications);
41	547	}	553	}
42	548	}	554	}
43	@@ -652,12 +658,10 @@
44	652	dirty_displays = true;	658	dirty_displays = true;
45	653	}	659	}
46	654		660
47	655	#include <iostream>
48	656	void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)	661	void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)
49	657	{	662	{
50	658	if (!equivalent_display_area(updated, original))	663	if (!equivalent_display_area(updated, original))
51	659	{	664	{
52	660	std::cout << "Original: " << original.extents() << "new: " << updated.extents() << '\n';
53	661	live_displays.remove(original.extents());	665	live_displays.remove(original.extents());
54	662	live_displays.add(updated.extents());	666	live_displays.add(updated.extents());
55	663		667
56	664		668
57	=== modified file 'src/miral/display_configuration_listeners.cpp'
58	--- src/miral/display_configuration_listeners.cpp 2017-08-21 14:18:55 +0000
59	+++ src/miral/display_configuration_listeners.cpp 2017-09-26 20:21:37 +0000
60	@@ -83,7 +83,8 @@
61	83	{	83	{
62	84	Output o{output};	84	Output o{output};
63	85		85
65	86	if (!o.connected() \|\| !o.valid()) return;	86	if (!o.valid() \|\| !o.used() \|\| !o.connected() \|\| o.power_mode() != mir_power_mode_on)
66			87	return;
67	87		88
68	88	auto op = find_if(	89	auto op = find_if(
69	89	begin(active_outputs), end(active_outputs), [&](Output const& oo)	90	begin(active_outputs), end(active_outputs), [&](Output const& oo)