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

[Alan Griffiths]

[miral-shell] Update maximized windows on display changes. {LP: #1705695)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:568
https://mir-jenkins.ubuntu.com/job/miral-ci/49/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-miral/74
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4981
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4970
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4970
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4970
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=artful/78/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=xenial/78/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=amd64,release=zesty/78/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=artful/78/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=xenial/78/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/78
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-miral/arch=i386,release=zesty/78/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

Yep, works ok

review: Approve

=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2017-03-01 16:32:46 +0000
+++ miral-shell/tiling_window_manager.cpp	2017-07-24 16:22:13 +0000
@@ -651,10 +651,12 @@
     dirty_displays = true;
 }
 
+#include <iostream>
 void TilingWindowManagerPolicy::advise_output_update(const Output& updated, const Output& original)
 {
     if (!equivalent_display_area(updated, original))
     {
+        std::cout << "Original: " << original.extents() << "new: " << updated.extents() << '\n';
         live_displays.remove(original.extents());
         live_displays.add(updated.extents());
 

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2017-06-09 09:49:53 +0000
+++ miral/basic_window_manager.cpp	2017-07-24 16:22:13 +0000
@@ -169,8 +169,21 @@
     for_each_workspace_containing(parent,
         [&](std::shared_ptr<miral::Workspace> const& workspace) { add_tree_to_workspace(window, workspace); });
 
-    if (window_info.state() == mir_window_state_fullscreen)
+    switch (window_info.state())
+    {
+    case mir_window_state_fullscreen:
         fullscreen_surfaces.insert(window_info.window());
+        break;
+
+    case mir_window_state_maximized:
+    case mir_window_state_vertmaximized:
+    case mir_window_state_horizmaximized:
+        maximized_surfaces.insert(window_info.window());
+        break;
+
+    default:
+        break;
+    }
 
     policy->advise_new_window(window_info);
 
@@ -233,6 +246,7 @@
     info_for(application).remove_window(info.window());
     mru_active_windows.erase(info.window());
     fullscreen_surfaces.erase(info.window());
+    maximized_surfaces.erase(info.window());
 
     application->destroy_surface(info.window());
 
@@ -329,6 +343,8 @@
             place_and_size(info, rect.top_left, rect.size);
         }
     }
+
+    update_maximized_windows_for_displays();
 }
 
 void miral::BasicWindowManager::remove_display(geometry::Rectangle const& area)
@@ -344,6 +360,49 @@
             place_and_size(info, rect.top_left, rect.size);
         }
     }
+
+    update_maximized_windows_for_displays();
+}
+
+void miral::BasicWindowManager::update_maximized_windows_for_displays()
+{
+    if (displays.size() == 0)
+        return;
+
+    auto const display_area = displays.bounding_rectangle();
+
+    for (auto window : maximized_surfaces)
+    {
+        if (window)
+        {
+            auto& info = info_for(window);
+
+            Rectangle rect{window.top_left(), window.size()};
+
+            switch (info.state())
+            {
+            case mir_window_state_maximized:
+                rect = display_area;
+                place_and_size(info, rect.top_left, rect.size);
+                break;
+
+            case mir_window_state_horizmaximized:
+                rect.top_left.x = display_area.top_left.x;
+                rect.size.width = display_area.size.width;
+                place_and_size(info, rect.top_left, rect.size);
+                break;
+
+            case mir_window_state_vertmaximized:
+                rect.top_left.y = display_area.top_left.y;
+                rect.size.height = display_area.size.height;
+                place_and_size(info, rect.top_left, rect.size);
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
 }
 
 bool miral::BasicWindowManager::handle_keyboard_event(MirKeyboardEvent const* event)
@@ -1128,6 +1187,18 @@
         fullscreen_surfaces.insert(window);
     }
 
+    switch (value)
+    {
+    case mir_window_state_maximized:
+    case mir_window_state_vertmaximized:
+    case mir_window_state_horizmaximized:
+        maximized_surfaces.insert(window);
+        break;
+
+    default:
+        maximized_surfaces.erase(window);
+    }
+
     if (window_info.state() == value)
     {
         return;

=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2017-04-03 16:14:01 +0000
+++ miral/basic_window_manager.h	2017-07-24 16:22:13 +0000
@@ -211,8 +211,9 @@
     MirEvent const* last_input_event{nullptr};
 #endif
     miral::MRUWindowList mru_active_windows;
-    using FullscreenSurfaces = std::set<Window>;
-    FullscreenSurfaces fullscreen_surfaces;
+    std::set<Window> fullscreen_surfaces;
+    std::set<Window> maximized_surfaces;
+    void update_maximized_windows_for_displays();
 
     friend class Workspace;
     using wwbimap_t = boost::bimap<

=== modified file 'miral/output.cpp'
--- miral/output.cpp	2016-07-22 11:12:58 +0000
+++ miral/output.cpp	2017-07-24 16:22:13 +0000
@@ -82,8 +82,18 @@
 
 auto miral::Output::extents() const -> Rectangle
 {
-    return Rectangle{self->top_left, self->modes[self->current_mode_index].size};
+    switch (self->orientation)
+    {
+    case mir_orientation_normal:
+    case mir_orientation_inverted:
+    default:
+        return Rectangle{self->top_left, self->modes[self->current_mode_index].size};
 
+    case mir_orientation_left:
+    case mir_orientation_right:
+        auto const unrotated_size = self->modes[self->current_mode_index].size;
+        return Rectangle{self->top_left, {unrotated_size.height.as_int(), unrotated_size.width.as_int()}};
+    }
 }
 
 auto miral::Output::valid() const -> bool