Merge into trunk : fix-1704776 : Code : MirAL

Status:

Merged

Approved by:

Gerry Boland on 2017-07-17

Approved revision:

563

Merged at revision:

563

Proposed branch:

lp:~alan-griffiths/miral/fix-1704776

Merge into:

lp:miral

Diff against target:

132 lines (+44/-22)

2 files modified

miral-shell/floating_window_manager.cpp (+42/-20)
miral-shell/floating_window_manager.h (+2/-2)

To merge this branch:

bzr merge lp:~alan-griffiths/miral/fix-1704776

Low

Fix Committed

Link a bug report

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

Commit message

[miral-shell] "floating" window manager allows resizing maximized windows

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-07-17:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/miral-ci/39/rebuild

review: Approve (continuous-integration)

lp:~alan-griffiths/miral/fix-1704776 updated on 2017-07-17

563. By Alan Griffiths on 2017-07-17: Better names

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2017-07-17:

#

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/miral-ci/40/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Gerry Boland (gerboland) wrote on 2017-07-17:

#

Sure, why not

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) on 2017-07-17:

#

review: Approve (continuous-integration)

 === modified file 'miral-shell/floating_window_manager.cpp'
 --- miral-shell/floating_window_manager.cpp	2017-04-18 15:12:42 +0000
 +++ miral-shell/floating_window_manager.cpp	2017-07-17 11:44:59 +0000
@@ -237,14 +237,14 @@
                  auto new_width = std::max(old_size.width + delta_width, Width{5});
                  auto new_height = std::max(old_size.height + delta_height, Height{5});
--                Displacement delta{
++                Displacement movement{
                      DeltaX{touch_pinch_left - old_touch_pinch_left},
                      DeltaY{touch_pinch_top  - old_touch_pinch_top}};
                  auto& window_info = tools.info_for(window);
--                keep_size_within_limits(window_info, delta, new_width, new_height);
++                keep_window_within_constraints(window_info, movement, new_width, new_height);
--                auto new_pos = window.top_left() + delta;
++                auto new_pos = window.top_left() + movement;
                  Size new_size{new_width, new_height};
                  {   // Workaround for lp:1627697
@@ -561,15 +561,15 @@
      int const x_sign = left_resize? -1 : 1;
      int const y_sign = top_resize?  -1 : 1;
--    auto delta = cursor-old_cursor;
--
--    auto new_width = old_pos.size.width + x_sign * delta.dx;
--    auto new_height = old_pos.size.height + y_sign * delta.dy;
--
--    keep_size_within_limits(window_info, delta, new_width, new_height);
++    auto movement = cursor-old_cursor;
++
++    auto new_width = old_pos.size.width + x_sign * movement.dx;
++    auto new_height = old_pos.size.height + y_sign * movement.dy;
++
++    keep_window_within_constraints(window_info, movement, new_width, new_height);
      Size new_size{new_width, new_height};
--    Point new_pos = top_left + left_resize*delta.dx + top_resize*delta.dy;
++    Point new_pos = top_left + left_resize*movement.dx + top_resize*movement.dy;
      WindowSpecification modifications;
      modifications.top_left() = new_pos;
@@ -579,24 +579,46 @@
      return true;
+ }
--void FloatingWindowManagerPolicy::keep_size_within_limits(
--    WindowInfo const& window_info, Displacement& delta, Width& new_width, Height& new_height) const
++void FloatingWindowManagerPolicy::keep_window_within_constraints(
++    WindowInfo const& window_info, Displacement& movement, Width& new_width, Height& new_height) const
+ {
++    switch (window_info.state())
++    {
++    case mir_window_state_maximized:
++    case mir_window_state_fullscreen:
++        new_width = window_info.window().size().width;
++        new_height = window_info.window().size().height;
++        movement = {0, 0};
++        break;
++
++    case mir_window_state_vertmaximized:
++        new_height = window_info.window().size().height;
++        movement.dy = DeltaY{0};
++        break;
++
++    case mir_window_state_horizmaximized:
++        new_width = window_info.window().size().width;
++        movement.dx - DeltaX{0};
++        break;
++
++    default:;
++    }
++
      auto const min_width  = std::max(window_info.min_width(), Width{5});
      auto const min_height = std::max(window_info.min_height(), Height{5});
      if (new_width < min_width)
+     {
          new_width = min_width;
--        if (delta.dx > DeltaX{0})
--            delta.dx = DeltaX{0};
++        if (movement.dx > DeltaX{0})
++            movement.dx = DeltaX{0};
+     }
      if (new_height < min_height)
+     {
          new_height = min_height;
--        if (delta.dy > DeltaY{0})
--            delta.dy = DeltaY{0};
++        if (movement.dy > DeltaY{0})
++            movement.dy = DeltaY{0};
+     }
      auto const max_width  = window_info.max_width();
@@ -605,15 +627,15 @@
      if (new_width > max_width)
+     {
          new_width = max_width;
--        if (delta.dx < DeltaX{0})
--            delta.dx = DeltaX{0};
++        if (movement.dx < DeltaX{0})
++            movement.dx = DeltaX{0};
+     }
      if (new_height > max_height)
+     {
          new_height = max_height;
--        if (delta.dy < DeltaY{0})
--            delta.dy = DeltaY{0};
++        if (movement.dy < DeltaY{0})
++            movement.dy = DeltaY{0};
+     }
+ }
 === modified file 'miral-shell/floating_window_manager.h'
 --- miral-shell/floating_window_manager.h	2017-04-18 15:12:42 +0000
 +++ miral-shell/floating_window_manager.h	2017-07-17 11:44:59 +0000
@@ -106,9 +106,9 @@
      void end_resize();
--    void keep_size_within_limits(
++    void keep_window_within_constraints(
          miral::WindowInfo const& window_info,
--        Displacement& delta,
++        Displacement& movement,
          Width& new_width,
          Height& new_height) const;

MirAL

Merge lp:~alan-griffiths/miral/fix-1704776 into lp:miral

Commit message

Description of the change

Preview Diff

Subscribers