1
=== modified file 'miral-shell/floating_window_manager.cpp'
2
--- miral-shell/floating_window_manager.cpp	2017-04-18 15:12:42 +0000
3
+++ miral-shell/floating_window_manager.cpp	2017-07-17 11:44:59 +0000
4
@@ -237,14 +237,14 @@
5
237
237
6
238
                auto new_width = std::max(old_size.width + delta_width, Width{5});
238
                auto new_width = std::max(old_size.width + delta_width, Width{5});
7
239
                auto new_height = std::max(old_size.height + delta_height, Height{5});
239
                auto new_height = std::max(old_size.height + delta_height, Height{5});
9
240
                Displacement delta{
240
                Displacement movement{
10
241
                    DeltaX{touch_pinch_left - old_touch_pinch_left},
241
                    DeltaX{touch_pinch_left - old_touch_pinch_left},
11
242
                    DeltaY{touch_pinch_top  - old_touch_pinch_top}};
242
                    DeltaY{touch_pinch_top  - old_touch_pinch_top}};
12
243
243
13
244
                auto& window_info = tools.info_for(window);
244
                auto& window_info = tools.info_for(window);
15
245
                keep_size_within_limits(window_info, delta, new_width, new_height);
245
                keep_window_within_constraints(window_info, movement, new_width, new_height);
16
246
246
18
247
                auto new_pos = window.top_left() + delta;
247
                auto new_pos = window.top_left() + movement;
19
248
                Size new_size{new_width, new_height};
248
                Size new_size{new_width, new_height};
20
249
249
21
250
                {   // Workaround for lp:1627697
250
                {   // Workaround for lp:1627697
22
@@ -561,15 +561,15 @@
23
561
    int const x_sign = left_resize? -1 : 1;
561
    int const x_sign = left_resize? -1 : 1;
24
562
    int const y_sign = top_resize?  -1 : 1;
562
    int const y_sign = top_resize?  -1 : 1;
25
563
563
32
564
    auto delta = cursor-old_cursor;
564
    auto movement = cursor-old_cursor;
33
565
565
34
566
    auto new_width = old_pos.size.width + x_sign * delta.dx;
566
    auto new_width = old_pos.size.width + x_sign * movement.dx;
35
567
    auto new_height = old_pos.size.height + y_sign * delta.dy;
567
    auto new_height = old_pos.size.height + y_sign * movement.dy;
36
568
568
37
569
    keep_size_within_limits(window_info, delta, new_width, new_height);
569
    keep_window_within_constraints(window_info, movement, new_width, new_height);
38
570
570
39
571
    Size new_size{new_width, new_height};
571
    Size new_size{new_width, new_height};
41
572
    Point new_pos = top_left + left_resize*delta.dx + top_resize*delta.dy;
572
    Point new_pos = top_left + left_resize*movement.dx + top_resize*movement.dy;
42
573
573
43
574
    WindowSpecification modifications;
574
    WindowSpecification modifications;
44
575
    modifications.top_left() = new_pos;
575
    modifications.top_left() = new_pos;
45
@@ -579,24 +579,46 @@
46
579
    return true;
579
    return true;
47
580
}
580
}
48
581
581
51
582
void FloatingWindowManagerPolicy::keep_size_within_limits(
582
void FloatingWindowManagerPolicy::keep_window_within_constraints(
52
583
    WindowInfo const& window_info, Displacement& delta, Width& new_width, Height& new_height) const
583
    WindowInfo const& window_info, Displacement& movement, Width& new_width, Height& new_height) const
53
584
{
584
{
54
585
    switch (window_info.state())
55
586
    {
56
587
    case mir_window_state_maximized:
57
588
    case mir_window_state_fullscreen:
58
589
        new_width = window_info.window().size().width;
59
590
        new_height = window_info.window().size().height;
60
591
        movement = {0, 0};
61
592
        break;
62
593
63
594
    case mir_window_state_vertmaximized:
64
595
        new_height = window_info.window().size().height;
65
596
        movement.dy = DeltaY{0};
66
597
        break;
67
598
68
599
    case mir_window_state_horizmaximized:
69
600
        new_width = window_info.window().size().width;
70
601
        movement.dx - DeltaX{0};
71
602
        break;
72
603
73
604
    default:;
74
605
    }
75
606
76
585
    auto const min_width  = std::max(window_info.min_width(), Width{5});
607
    auto const min_width  = std::max(window_info.min_width(), Width{5});
77
586
    auto const min_height = std::max(window_info.min_height(), Height{5});
608
    auto const min_height = std::max(window_info.min_height(), Height{5});
78
587
609
79
588
    if (new_width < min_width)
610
    if (new_width < min_width)
80
589
    {
611
    {
81
590
        new_width = min_width;
612
        new_width = min_width;
84
591
        if (delta.dx > DeltaX{0})
613
        if (movement.dx > DeltaX{0})
85
592
            delta.dx = DeltaX{0};
614
            movement.dx = DeltaX{0};
86
593
    }
615
    }
87
594
616
88
595
    if (new_height < min_height)
617
    if (new_height < min_height)
89
596
    {
618
    {
90
597
        new_height = min_height;
619
        new_height = min_height;
93
598
        if (delta.dy > DeltaY{0})
620
        if (movement.dy > DeltaY{0})
94
599
            delta.dy = DeltaY{0};
621
            movement.dy = DeltaY{0};
95
600
    }
622
    }
96
601
623
97
602
    auto const max_width  = window_info.max_width();
624
    auto const max_width  = window_info.max_width();
98
@@ -605,15 +627,15 @@
99
605
    if (new_width > max_width)
627
    if (new_width > max_width)
100
606
    {
628
    {
101
607
        new_width = max_width;
629
        new_width = max_width;
104
608
        if (delta.dx < DeltaX{0})
630
        if (movement.dx < DeltaX{0})
105
609
            delta.dx = DeltaX{0};
631
            movement.dx = DeltaX{0};
106
610
    }
632
    }
107
611
633
108
612
    if (new_height > max_height)
634
    if (new_height > max_height)
109
613
    {
635
    {
110
614
        new_height = max_height;
636
        new_height = max_height;
113
615
        if (delta.dy < DeltaY{0})
637
        if (movement.dy < DeltaY{0})
114
616
            delta.dy = DeltaY{0};
638
            movement.dy = DeltaY{0};
115
617
    }
639
    }
116
618
}
640
}
117
619
641
118
620
642
119
=== modified file 'miral-shell/floating_window_manager.h'
120
--- miral-shell/floating_window_manager.h	2017-04-18 15:12:42 +0000
121
+++ miral-shell/floating_window_manager.h	2017-07-17 11:44:59 +0000
122
@@ -106,9 +106,9 @@
123
106
106
124
107
    void end_resize();
107
    void end_resize();
125
108
108
127
109
    void keep_size_within_limits(
109
    void keep_window_within_constraints(
128
110
        miral::WindowInfo const& window_info,
110
        miral::WindowInfo const& window_info,
130
111
        Displacement& delta,
111
        Displacement& movement,
131
112
        Width& new_width,
112
        Width& new_width,
132
113
        Height& new_height) const;
113
        Height& new_height) const;
133
114
114
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-07-17
Gerry Boland (community)		2017-07-17	Approve on 2017-07-17
Review via email: mp+327514@code.launchpad.net